[SDC-29] rebase continue work to align source

Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>

291 files changed, 25013 insertions, 4990 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/VendorSoftwareProducts.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/VendorSoftwareProducts.java
index 3ead86dc14..53fe2af31d 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/VendorSoftwareProducts.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/VendorSoftwareProducts.java
@@ -141,7 +141,7 @@ public interface VendorSoftwareProducts extends VspEntities {
       notes = "Exports translated file to a zip file",
       response = File.class)
   Response getTranslatedFile(@PathParam("vspId") String vspId,
-                             @QueryParam("version") String version,
+                             @QueryParam("versionId") String versionId,
                              @HeaderParam(USER_ID_HEADER_PARAM) String user);
 
   @GET
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java
index 9f8f3d366f..c730066770 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java
@@ -38,9 +38,20 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.VersionedVendorSoftwareProd
 import org.openecomp.sdc.versioning.dao.types.Version;
 import org.openecomp.sdc.versioning.types.VersionInfo;
 import org.openecomp.sdc.versioning.types.VersionableEntityAction;
-import org.openecomp.sdcrests.vendorsoftwareproducts.types.*;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.PackageInfoDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.QuestionnaireResponseDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.ValidationResponseDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.VersionSoftwareProductActionRequestDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.VspCreationDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.VspDescriptionDto;
+import org.openecomp.sdcrests.vendorsoftwareproducts.types.VspDetailsDto;
 import org.openecomp.sdcrests.vsp.rest.VendorSoftwareProducts;
-import org.openecomp.sdcrests.vsp.rest.mapping.*;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapPackageInfoToPackageInfoDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapQuestionnaireResponseToQuestionnaireResponseDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapValidationResponseToDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapVersionedVendorSoftwareProductInfoToVspDetailsDto;
+import org.openecomp.sdcrests.vsp.rest.mapping.MapVspDescriptionDtoToVspDetails;
+import org.openecomp.sdcrests.vsp.rest.mapping.MspVspDetailsToVspCreationDto;
 import org.openecomp.sdcrests.wrappers.GenericCollectionWrapper;
 import org.openecomp.sdcrests.wrappers.StringWrapperResponse;
 import org.slf4j.MDC;
@@ -59,49 +70,49 @@ import java.util.List;
 @Scope(value = "prototype")
 public class VendorSoftwareProductsImpl implements VendorSoftwareProducts {
 
-    private VendorSoftwareProductManager vendorSoftwareProductManager =
-            VspManagerFactory.getInstance().createInterface();
+  private VendorSoftwareProductManager vendorSoftwareProductManager =
+      VspManagerFactory.getInstance().createInterface();
 
-    private static final Logger logger =
-            LoggerFactory.getLogger(VendorSoftwareProductsImpl.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(VendorSoftwareProductsImpl.class);
 
-    private ActivityLogManager activityLogManager =
-            ActivityLogManagerFactory.getInstance().createInterface();
+  private ActivityLogManager activityLogManager =
+      ActivityLogManagerFactory.getInstance().createInterface();
 
-    @Override
-    public Response createVsp(VspDescriptionDto vspDescriptionDto, String user) {
-        MdcUtil.initMdc(LoggerServiceName.Create_VSP.toString());
-        logger.audit(AuditMessages.AUDIT_MSG + AuditMessages.CREATE_VSP + vspDescriptionDto.getName());
-
-        VspDetails vspDetails =
-                new MapVspDescriptionDtoToVspDetails().applyMapping(vspDescriptionDto, VspDetails.class);
+  @Override
+  public Response createVsp(VspDescriptionDto vspDescriptionDto, String user) {
+    MdcUtil.initMdc(LoggerServiceName.Create_VSP.toString());
+    logger.audit(AuditMessages.AUDIT_MSG + AuditMessages.CREATE_VSP + vspDescriptionDto.getName());
 
-        vspDetails = vendorSoftwareProductManager.createVsp(vspDetails, user);
+    VspDetails vspDetails =
+        new MapVspDescriptionDtoToVspDetails().applyMapping(vspDescriptionDto, VspDetails.class);
 
-        MspVspDetailsToVspCreationDto mapping = new MspVspDetailsToVspCreationDto();
-        VspCreationDto vspCreationDto = mapping.applyMapping(vspDetails, VspCreationDto.class);
+    vspDetails = vendorSoftwareProductManager.createVsp(vspDetails, user);
 
-        return Response.ok(vspCreationDto).build();
-    }
+    MspVspDetailsToVspCreationDto mapping = new MspVspDetailsToVspCreationDto();
+    VspCreationDto vspCreationDto = mapping.applyMapping(vspDetails, VspCreationDto.class);
 
-    @Override
-    public Response listVsps(String versionFilter, String user) {
-        MdcUtil.initMdc(LoggerServiceName.List_VSP.toString());
-        List<VersionedVendorSoftwareProductInfo> vspList =
-                vendorSoftwareProductManager.listVsps(versionFilter, user);
-
-        GenericCollectionWrapper<VspDetailsDto> results = new GenericCollectionWrapper<>();
-        if (!vspList.isEmpty()) {
-            MapVersionedVendorSoftwareProductInfoToVspDetailsDto mapper =
-                    new MapVersionedVendorSoftwareProductInfoToVspDetailsDto();
-            for (VersionedVendorSoftwareProductInfo versionedVsp : vspList) {
-                results.add(mapper.applyMapping(versionedVsp, VspDetailsDto.class));
-            }
-        }
+    return Response.ok(vspCreationDto).build();
+  }
 
-        return Response.ok(results).build();
+  @Override
+  public Response listVsps(String versionFilter, String user) {
+    MdcUtil.initMdc(LoggerServiceName.List_VSP.toString());
+    List<VersionedVendorSoftwareProductInfo> vspList =
+        vendorSoftwareProductManager.listVsps(versionFilter, user);
+
+    GenericCollectionWrapper<VspDetailsDto> results = new GenericCollectionWrapper<>();
+    if (!vspList.isEmpty()) {
+      MapVersionedVendorSoftwareProductInfoToVspDetailsDto mapper =
+          new MapVersionedVendorSoftwareProductInfoToVspDetailsDto();
+      for (VersionedVendorSoftwareProductInfo versionedVsp : vspList) {
+        results.add(mapper.applyMapping(versionedVsp, VspDetailsDto.class));
+      }
     }
 
+    return Response.ok(results).build();
+  }
+
   @Override
   public Response getVsp(String vspId, String versionId, String user) {
     MdcUtil.initMdc(LoggerServiceName.Get_VSP.toString());
@@ -115,15 +126,15 @@ public class VendorSoftwareProductsImpl implements VendorSoftwareProducts {
     VersionInfo versionInfo = getVersionInfo(vspId, VersionableEntityAction.Read, user);
 
     //
-    if(vspDetails.getOldVersion()!=null && !"".equals(vspDetails.getOldVersion())) {
+    if (vspDetails.getOldVersion() != null && !"".equals(vspDetails.getOldVersion())) {
       if (Version.valueOf(versionId).equals(versionInfo.getActiveVersion())) {
         try {
           Version healedVersion = vendorSoftwareProductManager.callAutoHeal(vspId, versionInfo,
-              vspDetails , user);
+              vspDetails, user);
           vspDetails =
               vendorSoftwareProductManager
                   .getVsp(vspId, resolveVspVersion(vspId, healedVersion.toString(), user,
-                      VersionableEntityAction.Read),user);
+                      VersionableEntityAction.Read), user);
           versionInfo = getVersionInfo(vspId, VersionableEntityAction.Read, user);
         } catch (Exception e) {
           //to do
@@ -137,8 +148,8 @@ public class VendorSoftwareProductsImpl implements VendorSoftwareProducts {
             .applyMapping(new VersionedVendorSoftwareProductInfo(vspDetails, versionInfo),
                 VspDetailsDto.class);
 
-        return Response.ok(vspDetailsDto).build();
-    }
+    return Response.ok(vspDetailsDto).build();
+  }
 
   @Override
   public Response updateVsp(String vspId, String versionId, VspDescriptionDto vspDescriptionDto,
@@ -149,23 +160,23 @@ public class VendorSoftwareProductsImpl implements VendorSoftwareProducts {
     vspDetails.setId(vspId);
     vspDetails.setVersion(resolveVspVersion(vspId, null, user, VersionableEntityAction.Write));
 
-        vendorSoftwareProductManager.updateVsp(vspDetails, user);
+    vendorSoftwareProductManager.updateVsp(vspDetails, user);
 
-        return Response.ok().build();
-    }
+    return Response.ok().build();
+  }
 
-    @Override
-    public Response deleteVsp(String vspId, String user) {
-        MdcUtil.initMdc(LoggerServiceName.Delete_VSP.toString());
-        vendorSoftwareProductManager.deleteVsp(vspId, user);
+  @Override
+  public Response deleteVsp(String vspId, String user) {
+    MdcUtil.initMdc(LoggerServiceName.Delete_VSP.toString());
+    vendorSoftwareProductManager.deleteVsp(vspId, user);
 
-        return Response.ok().build();
-    }
+    return Response.ok().build();
+  }
 
-    @Override
-    public Response actOnVendorSoftwareProduct(String vspId, String versionId,
-                                               VersionSoftwareProductActionRequestDto request,
-                                               String user) throws IOException {
+  @Override
+  public Response actOnVendorSoftwareProduct(String vspId, String versionId,
+                                             VersionSoftwareProductActionRequestDto request,
+                                             String user) throws IOException {
 
     switch (request.getAction()) {
       case Checkout:
@@ -207,89 +218,88 @@ public class VendorSoftwareProductsImpl implements VendorSoftwareProducts {
     return Response.ok().build();
   }
 
-    @Override
-    public Response getValidationVsp(String user)
-            throws Exception {
-        String validationVspId = vendorSoftwareProductManager.fetchValidationVsp(user);
-        StringWrapperResponse response = new StringWrapperResponse(validationVspId);
-        return Response.ok(response).build();
-    }
+  @Override
+  public Response getValidationVsp(String user)
+      throws Exception {
+    String validationVspId = vendorSoftwareProductManager.fetchValidationVsp(user);
+    StringWrapperResponse response = new StringWrapperResponse(validationVspId);
+    return Response.ok(response).build();
+  }
 
 
-    @Override
-    public Response getOrchestrationTemplate(String vspId, String versionId, String user) {
-        MdcUtil.initMdc(LoggerServiceName.Get_Uploaded_File.toString());
-        byte[] orchestrationTemplateFile =
-                vendorSoftwareProductManager
-                        .getOrchestrationTemplateFile(vspId,
-                                resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read), user);
+  @Override
+  public Response getOrchestrationTemplate(String vspId, String versionId, String user) {
+    MdcUtil.initMdc(LoggerServiceName.Get_Uploaded_File.toString());
+    byte[] orchestrationTemplateFile =
+        vendorSoftwareProductManager
+            .getOrchestrationTemplateFile(vspId,
+                resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read), user);
 
-        if (orchestrationTemplateFile == null) {
-            return Response.status(Response.Status.NOT_FOUND).build();
-        }
-        Response.ResponseBuilder response = Response.ok(orchestrationTemplateFile);
-        response.header("Content-Disposition", "attachment; filename=LatestHeatPackage.zip");
-        return response.build();
+    if (orchestrationTemplateFile == null) {
+      return Response.status(Response.Status.NOT_FOUND).build();
     }
+    Response.ResponseBuilder response = Response.ok(orchestrationTemplateFile);
+    response.header("Content-Disposition", "attachment; filename=LatestHeatPackage.zip");
+    return response.build();
+  }
 
-    @Override
-    public Response listPackages(String category, String subCategory, String user) {
-        MdcUtil.initMdc(LoggerServiceName.List_Packages.toString());
-        List<PackageInfo> packageInfoList =
-                vendorSoftwareProductManager.listPackages(category, subCategory);
+  @Override
+  public Response listPackages(String category, String subCategory, String user) {
+    MdcUtil.initMdc(LoggerServiceName.List_Packages.toString());
+    List<PackageInfo> packageInfoList =
+        vendorSoftwareProductManager.listPackages(category, subCategory);
 
-        GenericCollectionWrapper<PackageInfoDto> results = new GenericCollectionWrapper<>();
-        MapPackageInfoToPackageInfoDto mapper = new MapPackageInfoToPackageInfoDto();
+    GenericCollectionWrapper<PackageInfoDto> results = new GenericCollectionWrapper<>();
+    MapPackageInfoToPackageInfoDto mapper = new MapPackageInfoToPackageInfoDto();
 
-        if (packageInfoList != null) {
-            for (PackageInfo packageInfo : packageInfoList) {
-                results.add(mapper.applyMapping(packageInfo, PackageInfoDto.class));
-            }
-        }
-        return Response.ok(results).build();
+    if (packageInfoList != null) {
+      for (PackageInfo packageInfo : packageInfoList) {
+        results.add(mapper.applyMapping(packageInfo, PackageInfoDto.class));
+      }
     }
+    return Response.ok(results).build();
+  }
 
   @Override
-  public Response getTranslatedFile(String vspId, String version, String user) {
+  public Response getTranslatedFile(String vspId, String versionId, String user) {
     MdcUtil.initMdc(LoggerServiceName.Get_Translated_File.toString());
-    File zipFile =
-        vendorSoftwareProductManager.getTranslatedFile(vspId,Version.valueOf(version), user);
 
-    Version versionObj = Version.valueOf(version);
-    Version resolvedVersion = versionObj == null
+    Version version = Version.valueOf(versionId);
+    Version resolvedVersion = version == null
         ? getVersionInfo(vspId, VersionableEntityAction.Read, user).getLatestFinalVersion()
-        : versionObj;
-
+        : version;
 
-        Response.ResponseBuilder response = Response.ok(zipFile);
-        if (zipFile == null) {
-            logger.audit(AuditMessages.AUDIT_MSG + AuditMessages.IMPORT_FAIL + vspId);
-            return Response.status(Response.Status.NOT_FOUND).build();
-        }
-        response.header("Content-Disposition", "attachment; filename=" + zipFile.getName());
+    File zipFile = vendorSoftwareProductManager.getTranslatedFile(vspId, resolvedVersion, user);
 
-        logger.audit(AuditMessages.AUDIT_MSG + AuditMessages.IMPORT_SUCCESS + vspId);
-        return response.build();
+    Response.ResponseBuilder response = Response.ok(zipFile);
+    if (zipFile == null) {
+      logger.audit(AuditMessages.AUDIT_MSG + AuditMessages.IMPORT_FAIL + vspId);
+      return Response.status(Response.Status.NOT_FOUND).build();
     }
+    response.header("Content-Disposition", "attachment; filename=" + zipFile.getName());
 
-    @Override
-    public Response getQuestionnaire(String vspId, String versionId, String user) {
-        MdcUtil.initMdc(LoggerServiceName.Get_Questionnaire_VSP.toString());
-        QuestionnaireResponse questionnaireResponse =
-                vendorSoftwareProductManager.getVspQuestionnaire(vspId,
-                        resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read), user);
-
-        if (questionnaireResponse.getErrorMessage() != null) {
-            return Response.status(Response.Status.EXPECTATION_FAILED).entity(
-                    new MapQuestionnaireResponseToQuestionnaireResponseDto()
-                            .applyMapping(questionnaireResponse, QuestionnaireResponseDto.class)).build();
-        }
+    logger.audit(AuditMessages.AUDIT_MSG + AuditMessages.IMPORT_SUCCESS + vspId);
+    return response.build();
+  }
 
-        QuestionnaireResponseDto result = new MapQuestionnaireResponseToQuestionnaireResponseDto()
-                .applyMapping(questionnaireResponse, QuestionnaireResponseDto.class);
-        return Response.ok(result).build();
+  @Override
+  public Response getQuestionnaire(String vspId, String versionId, String user) {
+    MdcUtil.initMdc(LoggerServiceName.Get_Questionnaire_VSP.toString());
+    QuestionnaireResponse questionnaireResponse =
+        vendorSoftwareProductManager.getVspQuestionnaire(vspId,
+            resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read), user);
+
+    if (questionnaireResponse.getErrorMessage() != null) {
+      return Response.status(Response.Status.EXPECTATION_FAILED).entity(
+          new MapQuestionnaireResponseToQuestionnaireResponseDto()
+              .applyMapping(questionnaireResponse, QuestionnaireResponseDto.class)).build();
     }
 
+    QuestionnaireResponseDto result = new MapQuestionnaireResponseToQuestionnaireResponseDto()
+        .applyMapping(questionnaireResponse, QuestionnaireResponseDto.class);
+    return Response.ok(result).build();
+  }
+
   @Override
   public Response updateQuestionnaire(String questionnaireData, String vspId, String
       versionId, String user) {
@@ -300,26 +310,26 @@ public class VendorSoftwareProductsImpl implements VendorSoftwareProducts {
     return Response.ok().build();
   }
 
-    @Override
-    public Response heal(String vspId, String versionId, String user) {
-        vendorSoftwareProductManager.heal(vspId, Version.valueOf(versionId), user);
-
-        return Response.ok().build();
-    }
+  @Override
+  public Response heal(String vspId, String versionId, String user) {
+    vendorSoftwareProductManager.heal(vspId, Version.valueOf(versionId), user);
 
-    @Override
-    public Response getVspInformationArtifact(String vspId, String versionId, String user) {
-        MdcUtil.initMdc(LoggerServiceName.Get_Information_Artifact.toString());
-        File textInformationArtifact =
-                vendorSoftwareProductManager.getInformationArtifact(vspId,
-                        resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read), user);
+    return Response.ok().build();
+  }
 
-        Response.ResponseBuilder response = Response.ok(textInformationArtifact);
-        if (textInformationArtifact == null) {
-            return Response.status(Response.Status.NOT_FOUND).build();
-        }
-        response
-                .header("Content-Disposition", "attachment; filename=" + textInformationArtifact.getName());
-        return response.build();
+  @Override
+  public Response getVspInformationArtifact(String vspId, String versionId, String user) {
+    MdcUtil.initMdc(LoggerServiceName.Get_Information_Artifact.toString());
+    File textInformationArtifact =
+        vendorSoftwareProductManager.getInformationArtifact(vspId,
+            resolveVspVersion(vspId, versionId, user, VersionableEntityAction.Read), user);
+
+    Response.ResponseBuilder response = Response.ok(textInformationArtifact);
+    if (textInformationArtifact == null) {
+      return Response.status(Response.Status.NOT_FOUND).build();
     }
+    response
+        .header("Content-Disposition", "attachment; filename=" + textInformationArtifact.getName());
+    return response.build();
+  }
 }
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/main/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/main/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseManagerImpl.java
index 451415c5ea..eb559f2e62 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/main/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/main/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseManagerImpl.java
@@ -25,6 +25,8 @@ import org.openecomp.sdc.activityLog.ActivityLogManager;
 import org.openecomp.sdc.activityLog.ActivityLogManagerFactory;
 import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity;
 import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
 import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage;
 import org.openecomp.sdc.logging.types.LoggerConstants;
@@ -87,6 +89,8 @@ public class VendorLicenseManagerImpl implements VendorLicenseManager {
       LicenseKeyGroupDaoFactory.getInstance().createInterface();
   private ActivityLogManager activityLogManager = ActivityLogManagerFactory.getInstance().createInterface();
   private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
+  private static final Logger logger =
+      LoggerFactory.getLogger(VendorLicenseManagerImpl.class);
 
   private static void sortVlmListByModificationTimeDescOrder(
       List<VersionedVendorLicenseModel> vendorLicenseModels) {
@@ -178,14 +182,21 @@ public class VendorLicenseManagerImpl implements VendorLicenseManager {
         version.setStatus(VersionStatus.Locked);
       }
 
-      VendorLicenseModelEntity vlm =
-          vendorLicenseModelDao.get(new VendorLicenseModelEntity(entry.getKey(), version));
-      if (vlm != null) {
-        VersionedVendorLicenseModel versionedVlm = new VersionedVendorLicenseModel();
-        versionedVlm.setVendorLicenseModel(vlm);
-        versionedVlm.setVersionInfo(versionInfo);
-        vendorLicenseModels.add(versionedVlm);
-      }
+      try {
+        VendorLicenseModelEntity vlm =
+            vendorLicenseModelDao.get(new VendorLicenseModelEntity(entry.getKey(), version));
+        if (vlm != null) {
+          VersionedVendorLicenseModel versionedVlm = new VersionedVendorLicenseModel();
+          versionedVlm.setVendorLicenseModel(vlm);
+          versionedVlm.setVersionInfo(versionInfo);
+          vendorLicenseModels.add(versionedVlm);
+        }
+      }catch(RuntimeException rte){
+      logger.error("Error trying to retrieve vlm["+entry.getKey()+"] version["+version.toString
+          ()+"] " +
+          "message:"+rte
+          .getMessage());
+    }
     }
 
     sortVlmListByModificationTimeDescOrder(vendorLicenseModels);
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/VSPPackage.zip b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/VSPPackage.zip
deleted file mode 100644
index ca55484a3c..0000000000
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/VSPPackage.zip
+++ /dev/null
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerFactoryImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerFactoryImpl.java
index 65aab2d9f4..77d496f0c8 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerFactoryImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerFactoryImpl.java
@@ -26,7 +26,11 @@ import org.openecomp.sdc.activitylog.dao.ActivityLogDaoFactory;
 import org.openecomp.sdc.healing.factory.HealingManagerFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.OrchestrationTemplateCandidateManager;
 import org.openecomp.sdc.vendorsoftwareproduct.OrchestrationTemplateCandidateManagerFactory;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDaoFactory;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.MibDaoFactory;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.NicDaoFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.OrchestrationTemplateDaoFactory;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.ProcessDaoFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductDaoFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDaoFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.factory.CandidateServiceFactory;
@@ -45,6 +49,10 @@ public class OrchestrationTemplateCandidateManagerFactoryImpl extends
           CompositionDataExtractorFactory.getInstance().createInterface(),
           ServiceModelDaoFactory.getInstance().createInterface(),
           CompositionEntityDataManagerFactory.getInstance().createInterface(),
+          NicDaoFactory.getInstance().createInterface(),
+          ComponentDaoFactory.getInstance().createInterface(),
+          MibDaoFactory.getInstance().createInterface(),
+          ProcessDaoFactory.getInstance().createInterface(),
           ActivityLogManagerFactory.getInstance().createInterface());
 
 
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java
index 9373bfb3a6..99a438f3a8 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java
@@ -19,11 +19,15 @@
  */
 
 package org.openecomp.sdc.vendorsoftwareproduct.impl;
-
+import static org.openecomp.sdc.vendorsoftwareproduct.VendorSoftwareProductConstants.GENERAL_COMPONENT_ID;
+import static org.openecomp.sdc.vendorsoftwareproduct.VendorSoftwareProductConstants.UniqueValues
+    .PROCESS_NAME;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.xalan.xslt.Process;
 import org.openecomp.core.model.dao.ServiceModelDao;
 import org.openecomp.core.model.types.ServiceElement;
+import org.openecomp.core.util.UniqueValueUtil;
 import org.openecomp.core.utilities.file.FileContentHandler;
 import org.openecomp.core.utilities.file.FileUtils;
 import org.openecomp.core.utilities.json.JsonUtil;
@@ -51,10 +55,16 @@ import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
 import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil;
 import org.openecomp.sdc.validation.util.ValidationManagerUtil;
 import org.openecomp.sdc.vendorsoftwareproduct.OrchestrationTemplateCandidateManager;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.MibDao;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.NicDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.OrchestrationTemplateDao;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.ProcessDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDao;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.MibEntity;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.OrchestrationTemplateCandidateData;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ProcessEntity;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.UploadData;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails;
 import org.openecomp.sdc.vendorsoftwareproduct.errors.OrchestrationTemplateNotFoundErrorBuilder;
@@ -69,7 +79,8 @@ import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.FilesDataStru
 import org.openecomp.sdc.vendorsoftwareproduct.utils.VendorSoftwareProductUtils;
 import org.openecomp.sdc.versioning.dao.types.Version;
 import org.openecomp.sdcrests.activitylog.types.ActivityType;
-
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.NicEntity;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -78,6 +89,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Collection;
 
 public class OrchestrationTemplateCandidateManagerImpl
     implements OrchestrationTemplateCandidateManager {
@@ -93,7 +105,11 @@ public class OrchestrationTemplateCandidateManagerImpl
   private CompositionDataExtractor compositionDataExtractor;
   private ServiceModelDao<ToscaServiceModel, ServiceElement> serviceModelDao;
   private CompositionEntityDataManager compositionEntityDataManager;
+  private NicDao nicDao;
+  private ComponentDao componentDao;
+  private MibDao mibDao;
   private ActivityLogManager activityLogManager;
+  private ProcessDao processDao;
 
   public OrchestrationTemplateCandidateManagerImpl(
       VendorSoftwareProductDao vendorSoftwareProductDao, VendorSoftwareProductInfoDao
@@ -103,6 +119,10 @@ public class OrchestrationTemplateCandidateManagerImpl
       CompositionDataExtractor compositionDataExtractor,
       ServiceModelDao<ToscaServiceModel, ServiceElement> serviceModelDao,
       CompositionEntityDataManager compositionEntityDataManager,
+      NicDao nicDao,
+      ComponentDao componentDao,
+      MibDao mibDao,
+      ProcessDao processDao,
       ActivityLogManager activityLogManager) {
     this.vendorSoftwareProductDao = vendorSoftwareProductDao;
     this.vspInfoDao = vspInfoDao;
@@ -112,6 +132,10 @@ public class OrchestrationTemplateCandidateManagerImpl
     this.compositionDataExtractor = compositionDataExtractor;
     this.serviceModelDao = serviceModelDao;
     this.compositionEntityDataManager = compositionEntityDataManager;
+    this.nicDao = nicDao;
+    this.componentDao = componentDao;
+    this.mibDao = mibDao;
+    this.processDao = processDao;
     this.activityLogManager = activityLogManager;
   }
 
@@ -220,6 +244,15 @@ public class OrchestrationTemplateCandidateManagerImpl
     if (!zipByteArrayInputStream.isPresent()) {
       return response;
     }
+    Map<String,String> componentsQustanniare = new HashMap<>();
+    Map<String, Map<String, String>> componentNicsQustanniare = new HashMap<>();
+    Map<String, Collection<MibEntity>> componentMIBList = new HashMap<>();
+    Map<String, Collection<ProcessEntity>> processes = new HashMap<>();
+    Map<String, ProcessEntity> processArtifact = new HashMap<>();
+
+    backupComponentsQuestionnaireBeforeDelete(vspId, version, componentsQustanniare,
+        componentNicsQustanniare, componentMIBList, processes, processArtifact);
+
     deleteUploadDataAndContent(vspId, version);
     saveHotData(vspId, version, zipByteArrayInputStream.get(), fileContentMap, tree);
 
@@ -230,6 +263,8 @@ public class OrchestrationTemplateCandidateManagerImpl
       serviceModelDao.storeServiceModel(vspId, version, toscaServiceModel);
       compositionEntityDataManager.saveCompositionData(vspId, version,
           compositionDataExtractor.extractServiceCompositionData(toscaServiceModel));
+      retainComponentQuestionnaireData(vspId, version, componentsQustanniare,
+          componentNicsQustanniare, componentMIBList, processes, processArtifact);
     }
     uploadFileResponse.addStructureErrors(uploadErrors);
 
@@ -330,6 +365,133 @@ public class OrchestrationTemplateCandidateManagerImpl
         .ofNullable(candidateService.getOrchestrationTemplateCandidate(vspId, version));
   }
 
+  private void retainComponentQuestionnaireData(String vspId, Version activeVersion,
+                                                Map<String, String> componentsQustanniare,
+                                                Map<String, Map<String, String>> componentNicsQustanniare,
+                                                Map<String, Collection<MibEntity>> componentMIBList,
+                                                Map<String,Collection<ProcessEntity>> processes,
+                                                Map<String, ProcessEntity> processArtifact) {
+    //VSP processes
+    restoreProcess(vspId, activeVersion, GENERAL_COMPONENT_ID, GENERAL_COMPONENT_ID, processes,
+        processArtifact);
+    Collection<ComponentEntity>
+        components = vendorSoftwareProductDao.listComponents(vspId, activeVersion);
+    components.forEach(componentEntity -> {
+      String componentName = componentEntity.getComponentCompositionData().getName();
+      if( componentsQustanniare.containsKey(componentName) ){
+        componentDao.updateQuestionnaireData(vspId, activeVersion,
+            componentEntity.getId(),componentsQustanniare.get(componentEntity.getComponentCompositionData()
+                .getName()));
+        if( componentNicsQustanniare.containsKey(componentName) ){
+          Map<String, String> nicsQustanniare=componentNicsQustanniare.get(componentName);
+          Collection<NicEntity>
+              nics=nicDao.list(new NicEntity(vspId, activeVersion, componentEntity.getId(), null));
+              nics.forEach(nicEntity -> {
+            if(nicsQustanniare.containsKey(nicEntity.getNicCompositionData().getName())){
+              nicDao.updateQuestionnaireData(vspId, activeVersion,componentEntity.getId
+                  (),nicEntity.getId(),nicsQustanniare.get(nicEntity.getNicCompositionData().getName()));
+            }
+          });
+        }
+        //MIB
+        if(componentMIBList.containsKey(componentName)) {
+          Collection<MibEntity> mibList = componentMIBList.get(componentName);
+          mibList.forEach(mib -> {
+            mib.setComponentId(componentEntity.getId());
+            mibDao.create(mib);
+          });
+        }
+        //VFC processes
+        restoreProcess(vspId, activeVersion, componentEntity.getId(), componentName, processes,
+            processArtifact);
+      }
+    });
+  }
+
+  private void backupComponentsQuestionnaireBeforeDelete(String vspId, Version activeVersion,
+                                                         Map<String, String> componentsQustanniare,
+                                                         Map<String, Map<String, String>>
+                                                             componentNicsQustanniare,
+                                                         Map<String, Collection<MibEntity>>
+                                                             componentMIBList,
+                                                         Map<String, Collection<ProcessEntity>> componentProcesses,
+                                                         Map<String, ProcessEntity> processArtifact) {
+    //backup VSP processes
+    backupProcess(vspId, activeVersion, GENERAL_COMPONENT_ID, GENERAL_COMPONENT_ID,
+        componentProcesses,processArtifact);
+    Collection<ComponentEntity> componentsCompositionAndQuestionnaire= vendorSoftwareProductDao
+        .listComponentsCompositionAndQuestionnaire(vspId,
+            activeVersion);
+    componentsCompositionAndQuestionnaire.forEach(componentEntity ->{
+      String componentName=componentEntity.getComponentCompositionData().getName();
+      componentsQustanniare.put(componentName,componentEntity
+          .getQuestionnaireData());
+      Collection<NicEntity>
+          nics=nicDao.list(new NicEntity(vspId, activeVersion,componentEntity.getId(),null));
+      //backup mib
+      Collection<MibEntity> componentMIB = mibDao.listArtifacts(new
+          MibEntity(vspId, activeVersion, componentEntity.getId(), null));
+      if(CollectionUtils.isNotEmpty(componentMIB)){
+        componentMIBList.put(componentName,componentMIB);
+      }
+
+      //backup component processes
+      backupProcess(vspId, activeVersion, componentEntity.getId(), componentName,
+          componentProcesses,processArtifact);
+      if(CollectionUtils.isNotEmpty(nics)) {
+        Map<String, String> nicsQustanniare = new HashMap<>();
+        nics.forEach(nicEntity -> {
+           NicEntity nic = nicDao.get(new NicEntity(vspId, activeVersion, componentEntity.getId(),
+           nicEntity.getId()));
+          NicEntity nicQuestionnaire = nicDao.getQuestionnaireData(vspId,activeVersion,
+              componentEntity.getId(),nicEntity.getId());
+
+          nicsQustanniare
+              .put(nicEntity.getNicCompositionData().getName(), nicQuestionnaire.getQuestionnaireData());
+        });
+        componentNicsQustanniare.put(componentName, nicsQustanniare);
+      }
+    });
+  }
+
+  private void backupProcess(String vspId, Version activeVersion, String componentId,
+                             String componentName, Map<String,
+                             Collection<ProcessEntity>> processes,
+                             Map<String,ProcessEntity> processArtifact){
+    Collection<ProcessEntity> processList = vendorSoftwareProductDao.listProcesses(vspId,
+        activeVersion, componentId);
+    if(!processList.isEmpty()){
+      processes.put(componentName,processList);
+      processList.forEach(process -> {
+        //ProcessArtifactEntity artifact = vendorSoftwareProductDao.getProcessArtifact(vspId,
+        //    activeVersion, componentId, process.getId());
+        ProcessEntity artifact = processDao.get(new ProcessEntity(vspId,activeVersion,componentId,process.getId()));
+        if(artifact.getArtifact()!=null) {
+          processArtifact.put(process.getId(), artifact);
+        }
+      });
+    }
+  }
+
+  private void restoreProcess(String vspId, Version activeVersion, String componentId,
+                              String componentName, Map<String, Collection<ProcessEntity>> processes,
+                              Map<String, ProcessEntity> processArtifact){
+    if(processes.containsKey(componentName)) {
+      Collection<ProcessEntity> processList = processes.get(componentName);
+      processList.forEach(process -> {
+        //Reatin VFC process
+        if (!GENERAL_COMPONENT_ID.equals(componentId) && processArtifact.containsKey(process.getId
+            ())) {
+          ProcessEntity artifact = processArtifact.get(process.getId());
+          artifact.setComponentId(componentId);
+          UniqueValueUtil.createUniqueValue(PROCESS_NAME, vspId, activeVersion.toString(),
+              componentId, process.getName());
+          vendorSoftwareProductDao.createProcess(artifact);
+        }
+      });
+    }
+  }
+
   private HeatStructureTree createAndValidateHeatTree(OrchestrationTemplateActionResponse response,
                                                       FileContentHandler fileContentMap) {
     VendorSoftwareProductUtils.addFileNamesToUploadFileResponse(fileContentMap, response);
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
index 0d2023f387..2d1b62cd40 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
@@ -472,10 +472,17 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa
       if (user.equals(versionInfo.getLockingUser())) {
         version.setStatus(VersionStatus.Locked);
       }
-      VspDetails vsp = vspInfoDao.get(new VspDetails(entry.getKey(), version));
-      if (vsp != null && !vsp.getId().equals(VALIDATION_VSP_ID)) {
-        vsp.setValidationDataStructure(null);
-        vsps.add(new VersionedVendorSoftwareProductInfo(vsp, versionInfo));
+      try {
+        VspDetails vsp = vspInfoDao.get(new VspDetails(entry.getKey(), version));
+        if (vsp != null && !vsp.getId().equals(VALIDATION_VSP_ID)) {
+          vsp.setValidationDataStructure(null);
+          vsps.add(new VersionedVendorSoftwareProductInfo(vsp, versionInfo));
+        }
+      }catch(RuntimeException rte){
+        logger.error("Error trying to retrieve vsp["+entry.getKey()+"] version["+version.toString
+            ()+"] " +
+            "message:"+rte
+            .getMessage());
       }
     }
 
diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java
index 0be6a55df6..f850afbab8 100644
--- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java
+++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/errors/Messages.java
@@ -35,7 +35,7 @@ public enum Messages {
   MANIFEST_NOT_EXIST("Manifest doesn't exist"),
   FILE_TYPE_NOT_LEGAL("File type not legal as data for other file"),
   MODULE_IN_MANIFEST_NO_YAML("Module '%s', has no yaml file reference"),
-  NO_MODULES_IN_MANIFEST("At least on Base/Module must be defined \n"),
+  NO_MODULES_IN_MANIFEST("At least one Base/Module must be defined \n"),
   MODULE_IN_MANIFEST_VOL_ENV_NO_VOL("Module '%s', has volume Env. reference with no Volume " +
       "reference"),
   ILLEGAL_MANIFEST("Illegal Manifest"),
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml
index bab8bc0e01..08a09273c6 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.amdocs.zusammen</groupId>
             <artifactId>zusammen-adaptor-inbound-api</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.openecomp.sdc</groupId>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml
index 9bb1e1dbc0..c1870d8c64 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml
@@ -21,17 +21,17 @@
         <dependency>
             <groupId>com.amdocs.zusammen</groupId>
             <artifactId>zusammen-commons-utils</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.amdocs.zusammen</groupId>
             <artifactId>zusammen-adaptor-inbound-api</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.amdocs.zusammen</groupId>
             <artifactId>zusammen-adaptor-inbound-impl</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.amdocs.zusammen.plugin</groupId>
             <artifactId>zusammen-search-index-empty-plugin</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-plugin/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-plugin/pom.xml
index ff45d1fa56..57f92f1b09 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-plugin/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-plugin/pom.xml
@@ -15,23 +15,23 @@
         <dependency>
             <groupId>com.amdocs.zusammen</groupId>
             <artifactId>zusammen-sdk</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.amdocs.zusammen</groupId>
             <artifactId>zusammen-commons-db-api</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.amdocs.zusammen</groupId>
             <artifactId>zusammen-commons-db-impl</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>com.amdocs.zusammen.plugin</groupId>
             <artifactId>zusammen-state-store-cassandra-plugin</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/CompositionDataHealer.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/CompositionDataHealer.java
index 283f6c83b6..99e0a0ac6c 100644
--- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/CompositionDataHealer.java
+++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/CompositionDataHealer.java
@@ -172,7 +172,9 @@ public class CompositionDataHealer implements Healer {
         JsonUtil.json2Object(component.getCompositionData(), ComponentData.class);
     componentData
         .setDisplayName(compositionDataExtractor.getComponentDisplayName(componentData.getName()));
-    componentData.setVfcCode(componentData.getDisplayName());
+    String displayName = componentData.getDisplayName();
+    componentData.setName(displayName);
+    componentData.setVfcCode(displayName);
     component.setCompositionData(JsonUtil.object2Json(componentData));
 
     mdcDataDebugMessage.debugExitMessage("VSP id, component id", component.getVspId(), component
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java
index 3c27a0fac8..fb0622cd67 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java
@@ -26,6 +26,8 @@ import org.openecomp.sdc.common.utils.CommonUtil;
 import org.openecomp.sdc.datatypes.error.ErrorMessage;
 import org.openecomp.sdc.enrichment.inter.Enricher;
 import org.openecomp.sdc.enrichment.inter.ExternalArtifactEnricherInterface;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
 
 import java.io.InputStream;
@@ -43,6 +45,7 @@ public class ExternalArtifactEnricher extends Enricher {
       "An Error has occured during enrichment of external artifacts ";
   private static Collection<String> implementingClasses =
       getExternalArtifactEnrichedImplClassesList();
+  private static Logger logger = LoggerFactory.getLogger(ExternalArtifactEnricher.class);
 
   private static Collection<String> getExternalArtifactEnrichedImplClassesList() {
     InputStream externalArtifactEnrichConfigurationJson =
@@ -68,7 +71,8 @@ public class ExternalArtifactEnricher extends Enricher {
                 externalArtifactEnricherInstance.enrich(this.data);
             }
         } catch (Exception e) {
-            e.printStackTrace(); //// FIXME: 29-Nov-16
+            e.printStackTrace();
+          logger.error(e.getMessage());
         }
 
     mdcDataDebugMessage.debugExitMessage(null, null);
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java
index b4a2815d69..a5f6529bbb 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java
@@ -80,14 +80,15 @@ public class ProcessArtifactEnricher implements ExternalArtifactEnricherInterfac
                   componentId, entity.getId());*/
 
     processes.stream()
-        .filter(entity -> entity.getType().equals(ProcessType.Lifecycle_Operations))
         .forEach(entity -> {
           ProcessEntity artifactEntity = new ProcessEntity(vspId, version,
               componentId, entity.getId());
 
           ProcessEntity artifactProcessEntity = getProcessDao().get(artifactEntity);
           //ProcessArtifactEntity artifact = getProcessArtifactDao().get(artifactEntity);
-          if (artifactProcessEntity != null) {
+          if (artifactProcessEntity != null && ProcessType.Lifecycle_Operations.equals(
+              artifactProcessEntity.getType())
+              && artifactProcessEntity.getArtifactName() != null ) {
             String componentName = componentEntity.getComponentCompositionData().getName();
             String path = componentName + File.separator
                 + ArtifactCategory.DEPLOYMENT.getDisplayName() + File.separator
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java
index d75c83f24c..93c4e67fc9 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java
@@ -59,6 +59,7 @@ public class AbstractSubstituteToscaEnricher {
 
     final Map<String, NodeTemplate> node_templates =
         serviceTemplate.getTopology_template().getNode_templates();
+    if(node_templates == null) return errors;
 
     final Map<String, List<String>> componentDisplayNameToNodeTempalteIds =
         populateAllNodeTemplateIdForComponent(node_templates, serviceTemplate, toscaModel);
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java
index cfb241483a..aeefc91aa3 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java
@@ -28,6 +28,7 @@ import java.util.Collection;
 
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
 public class ProcessArtifactEnricherTest {
@@ -56,7 +57,6 @@ public class ProcessArtifactEnricherTest {
     version.setMinor(0);
 
     ComponentEntity componentEntity = getComponentEntity(vspId, version, componentId);
-    setMockToEnrichComponent(vspId, componentId, version);
 
     ProcessEntity entity = new ProcessEntity(vspId, version, componentId, null);
     ProcessEntity processEntity = new ProcessEntity();
@@ -64,6 +64,8 @@ public class ProcessArtifactEnricherTest {
     processEntity.setVspId(vspId);
     processEntity.setVersion(version);
     processEntity.setComponentId(componentId);
+    processEntity.setArtifactName("artifact_1kb.txt");
+    processEntity.setArtifact(getMibByteBuffer("/mock/enrichProcess/artifact_1kb.txt"));
 
     Collection<ComponentEntity> componentList = new ArrayList<ComponentEntity>();
     componentList.add(componentEntity);
@@ -73,6 +75,8 @@ public class ProcessArtifactEnricherTest {
     list.add(processEntity);
     when(processDaoMock.list(entity)).thenReturn(list);
 
+    when(processDaoMock.get(anyObject())).thenReturn(processEntity);
+
     EnrichmentInfo info = new EnrichmentInfo();
     info.setVersion(version);
     info.setKey(vspId);
@@ -92,19 +96,6 @@ public class ProcessArtifactEnricherTest {
 
   }
 
-  private void setMockToEnrichComponent(String vspId, String componentId, Version version) {
-    ProcessEntity returnedArtifact = new ProcessEntity();
-    returnedArtifact.setVspId(vspId);
-    returnedArtifact.setVersion(version);
-    returnedArtifact.setComponentId(componentId);
-    returnedArtifact.setArtifactName("artifact_1kb.txt");
-    returnedArtifact.setArtifact(getMibByteBuffer("/mock/enrichProcess/artifact_1kb.txt"));
-
-    Mockito.when(processDaoMock.get(anyObject()))
-        .thenReturn(returnedArtifact);
-    Mockito.doNothing().when(enrichedServiceModelDaoMock).storeExternalArtifact(anyObject());
-  }
-
   private ComponentEntity getComponentEntity(String vspId, Version version, String componentId) {
     ComponentEntity componentEntity = new ComponentEntity();
     componentEntity.setId(componentId);
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java
index 736318bcab..c036e39c21 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/TranslationContext.java
@@ -42,8 +42,11 @@ import org.openecomp.sdc.translator.services.heattotosca.NameExtractor;
 import org.openecomp.sdc.translator.services.heattotosca.globaltypes.GlobalTypesGenerator;
 
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -58,6 +61,7 @@ public class TranslationContext {
   private static Map<String, ImplementationConfiguration> nameExtractorImplMap;
   private static Map<String, ImplementationConfiguration> supportedConsolidationComputeResources;
   private static Map<String, ImplementationConfiguration> supportedConsolidationPortResources;
+  private static List enrichPortResourceProperties;
 
   static {
     Configuration config = ConfigurationManager.lookup();
@@ -77,11 +81,19 @@ public class TranslationContext {
     supportedConsolidationPortResources = config.populateMap(ConfigConstants
         .MANDATORY_UNIFIED_MODEL_NAMESPACE, ConfigConstants
         .SUPPORTED_CONSOLIDATION_PORT_RESOURCES_KEY, ImplementationConfiguration.class);
+    enrichPortResourceProperties = config.getAsStringValues(ConfigConstants
+        .MANDATORY_UNIFIED_MODEL_NAMESPACE, ConfigConstants
+        .ENRICH_PORT_RESOURCE_PROP);
 
   }
 
   private Map<String, UnifiedSubstitutionData> unifiedSubstitutionData = new HashMap<>();
   private ManifestFile manifest;
+
+  public static List getEnrichPortResourceProperties() {
+    return enrichPortResourceProperties;
+  }
+
   private FileContentHandler files = new FileContentHandler();
   private Map<String, FileData.Type> manifestFiles = new HashMap<>();
   //Key - file name, value - file type
@@ -242,6 +254,19 @@ public class TranslationContext {
     return translatedIds;
   }
 
+  public Set<String> getAllTranslatedResourceIdsFromDiffNestedFiles(String
+                                                                        nestedHeatFileNameToSkip){
+    Set<String> allTranslatedResourceIds = new HashSet<>();
+
+    this.translatedIds.entrySet().stream().filter(
+        heatFileNameToTranslatedIdsEntry -> !heatFileNameToTranslatedIdsEntry.getKey()
+            .equals(nestedHeatFileNameToSkip)).forEach(heatFileNameToTranslatedIdsEntry -> {
+      allTranslatedResourceIds.addAll(heatFileNameToTranslatedIdsEntry.getValue().keySet());
+    });
+
+    return allTranslatedResourceIds;
+  }
+
   // get tosca name from mapping configuration file
   //element type - parameter/attribute
   // element name - heat parameter/attribute name
@@ -449,4 +474,6 @@ public class TranslationContext {
     return this.unifiedSubstitutionData.get(serviceTemplateName).getGlobalNodeTypeIndex
         (computeType);
   }
+
+
 }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConfigConstants.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConfigConstants.java
index f6918e382b..ca9f21b79a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConfigConstants.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConfigConstants.java
@@ -40,6 +40,9 @@ public class ConfigConstants {
       "supportedConsolidationComputeResources";
   public static final String SUPPORTED_CONSOLIDATION_PORT_RESOURCES_KEY =
       "supportedConsolidationPortResources";
+  public static final String ENRICH_PORT_RESOURCE_PROP =
+      "enrichPortResourceProperties";
+
 
   //others
   public static final String TRANS_MAPPING_DELIMITER_CHAR = "#";
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
index a89d08bcf6..148e754cfd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
@@ -2,6 +2,8 @@ package org.openecomp.sdc.translator.services.heattotosca;
 
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.math.NumberUtils;
+import org.openecomp.sdc.common.errors.CoreException;
+import org.openecomp.sdc.common.errors.ErrorCode;
 import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration;
 import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
 import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
@@ -141,13 +143,21 @@ public class ConsolidationDataUtil {
    *
    * @param context              the context
    * @param serviceTemplate      the service template
-   * @param nestedNodeTemplateId the nested node template id
-   * @return the nested template consolidation data
+   * @param nestedHeatFileName
+   *@param nestedNodeTemplateId the nested node template id  @return the nested template consolidation data
    */
   public static NestedTemplateConsolidationData getNestedTemplateConsolidationData(
       TranslationContext context,
       ServiceTemplate serviceTemplate,
-      String nestedNodeTemplateId) {
+      String nestedHeatFileName, String nestedNodeTemplateId) {
+
+    if(isNestedResourceIdOccuresInDifferentNestedFiles(context, nestedHeatFileName,
+        nestedNodeTemplateId)){
+      throw new CoreException((new ErrorCode.ErrorCodeBuilder())
+          .withMessage("Resource with id "
+              + nestedNodeTemplateId + " occures more than once in different addOn "
+              + "files").build());
+    }
 
     ConsolidationData consolidationData = context.getConsolidationData();
     String serviceTemplateFileName = ToscaUtil.getServiceTemplateFileName(serviceTemplate);
@@ -176,6 +186,12 @@ public class ConsolidationDataUtil {
     return nestedTemplateConsolidationData;
   }
 
+  private static boolean isNestedResourceIdOccuresInDifferentNestedFiles(TranslationContext context,
+                                                                         String nestedHeatFileName,
+                                                                         String nestedNodeTemplateId) {
+    return context.getAllTranslatedResourceIdsFromDiffNestedFiles(nestedHeatFileName).contains(nestedNodeTemplateId);
+  }
+
   /**
    * Update group id information in consolidation data.
    *
@@ -372,7 +388,7 @@ public class ConsolidationDataUtil {
     } else if (consolidationEntityType == ConsolidationEntityType.NESTED
         || consolidationEntityType == ConsolidationEntityType.VFC_NESTED) {
       entityConsolidationData = getNestedTemplateConsolidationData(translationContext,
-          serviceTemplate, dependentNodeTemplateId);
+          serviceTemplate, translateTo.getHeatFileName(), dependentNodeTemplateId);
     }
 
     if (entityConsolidationData.getNodesConnectedIn() == null) {
@@ -530,7 +546,8 @@ public class ConsolidationDataUtil {
   public static void updateNestedNodeTemplateId(TranslateTo translateTo) {
     TranslationContext context = translateTo.getContext();
     ServiceTemplate serviceTemplate = translateTo.getServiceTemplate();
-    getNestedTemplateConsolidationData(context, serviceTemplate, translateTo.getTranslatedId());
+    getNestedTemplateConsolidationData(
+        context, serviceTemplate, translateTo.getHeatFileName(), translateTo.getTranslatedId());
   }
 
   public static void removeSharedResource(ServiceTemplate serviceTemplate,
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
index 471b1475d6..336d56a77f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
@@ -46,6 +46,7 @@ import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition;
 import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
 import org.openecomp.sdc.tosca.datatypes.model.NodeType;
 import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition;
+import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition;
 import org.openecomp.sdc.tosca.datatypes.model.PropertyType;
 import org.openecomp.sdc.tosca.datatypes.model.RelationshipTemplate;
 import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment;
@@ -66,6 +67,7 @@ import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolida
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.EntityConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.FileComputeConsolidationData;
+import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.FilePortConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.GetAttrFuncData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.NestedTemplateConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.PortTemplateConsolidationData;
@@ -346,12 +348,13 @@ public class UnifiedCompositionService {
                                             List<UnifiedCompositionData> unifiedCompositionDataList,
                                             TranslationContext context) {
     handleUnifiedNestedNodeType(mainServiceTemplate, nestedServiceTemplate, context);
-    updateUnifiedNestedTemplates(mainServiceTemplate, nestedServiceTemplate, unifiedCompositionDataList, context);
+    updateUnifiedNestedTemplates(mainServiceTemplate, nestedServiceTemplate,
+        unifiedCompositionDataList, context);
   }
 
   private void handleGetAttrInConnectivity(ServiceTemplate serviceTemplate,
-                                                   Set<String> unifiedNodeIds,
-                                                   TranslationContext context) {
+                                           Set<String> unifiedNodeIds,
+                                           TranslationContext context) {
     Map<String, NodeTemplate> nodeTemplates =
         serviceTemplate.getTopology_template().getNode_templates();
     String serviceTemplateFileName = ToscaUtil.getServiceTemplateFileName(serviceTemplate);
@@ -387,7 +390,7 @@ public class UnifiedCompositionService {
         context.getGlobalSubstitutionServiceTemplate();
 
     newNestedNodeTypeId.ifPresent(
-        newNestedNodeTypeIdVal -> updateNestedNodeType(nodeTypeId, newNestedNodeTypeIdVal,
+        newNestedNodeTypeIdVal -> handleNestedNodeType(nodeTypeId, newNestedNodeTypeIdVal,
             nestedServiceTemplate, mainServiceTemplate, globalSubstitutionServiceTemplate,
             context));
 
@@ -403,26 +406,97 @@ public class UnifiedCompositionService {
         ToscaUtil.getServiceTemplateFileName(nestedServiceTemplate));
   }
 
+  private void handleNestedNodeType(String nodeTypeId, String newNestedNodeTypeId,
+                                    ServiceTemplate nestedServiceTemplate,
+                                    ServiceTemplate mainServiceTemplate,
+                                    ServiceTemplate globalSubstitutionServiceTemplate,
+                                    TranslationContext context) {
+    updateNestedServiceTemplate(nestedServiceTemplate, context);
+    updateNestedNodeType(nodeTypeId, newNestedNodeTypeId, nestedServiceTemplate,
+        mainServiceTemplate,
+        globalSubstitutionServiceTemplate, context);
+
+
+  }
+
+  private void updateNestedServiceTemplate(ServiceTemplate nestedServiceTemplate,
+                                           TranslationContext context) {
+    enrichPortProperties(nestedServiceTemplate, context);
+  }
+
+  private void enrichPortProperties(ServiceTemplate nestedServiceTemplate,
+                                    TranslationContext context) {
+    String nestedServiceTemplateFileName =
+        ToscaUtil.getServiceTemplateFileName(nestedServiceTemplate);
+    FilePortConsolidationData filePortConsolidationData =
+        context.getConsolidationData().getPortConsolidationData().getFilePortConsolidationData
+            (nestedServiceTemplateFileName);
+
+    if (Objects.nonNull(filePortConsolidationData)) {
+      Set<String> portNodeTemplateIds = filePortConsolidationData.getAllPortNodeTemplateIds();
+      if (Objects.nonNull(portNodeTemplateIds)) {
+        for (String portNodeTemplateId : portNodeTemplateIds) {
+          NodeTemplate portNodeTemplate = DataModelUtil.getNodeTemplate(nestedServiceTemplate,
+              portNodeTemplateId);
+          List<EntityConsolidationData> portEntityConsolidationDataList = new ArrayList<>();
+          portEntityConsolidationDataList.add(filePortConsolidationData
+              .getPortTemplateConsolidationData(portNodeTemplateId));
+
+          handleNodeTypeProperties(nestedServiceTemplate,
+              portEntityConsolidationDataList, portNodeTemplate, UnifiedCompositionEntity.Port,
+              null, context);
+        }
+      }
+    }
+  }
+
   private void updateNestedNodeType(String nodeTypeId, String newNestedNodeTypeId,
                                     ServiceTemplate nestedServiceTemplate,
                                     ServiceTemplate mainServiceTemplate,
                                     ServiceTemplate globalSubstitutionServiceTemplate,
                                     TranslationContext context) {
+    String indexedNewNestedNodeTypeId =
+        updateNodeTypeId(nodeTypeId, newNestedNodeTypeId, nestedServiceTemplate,
+            mainServiceTemplate,
+            globalSubstitutionServiceTemplate, context);
+
+    updateNodeTypeProperties(nestedServiceTemplate, globalSubstitutionServiceTemplate,
+        indexedNewNestedNodeTypeId);
+  }
+
+  private void updateNodeTypeProperties(ServiceTemplate nestedServiceTemplate,
+                                        ServiceTemplate globalSubstitutionServiceTemplate,
+                                        String nodeTypeId) {
+    ToscaAnalyzerService toscaAnalyzerService = new ToscaAnalyzerServiceImpl();
+    Map<String, PropertyDefinition> nodeTypePropertiesDefinition =
+        toscaAnalyzerService.manageSubstitutionNodeTypeProperties(nestedServiceTemplate);
+    NodeType nestedNodeType =
+        DataModelUtil.getNodeType(globalSubstitutionServiceTemplate, nodeTypeId);
+    nestedNodeType.setProperties(nodeTypePropertiesDefinition);
+  }
+
+  private String updateNodeTypeId(String nodeTypeId, String newNestedNodeTypeId,
+                                  ServiceTemplate nestedServiceTemplate,
+                                  ServiceTemplate mainServiceTemplate,
+                                  ServiceTemplate globalSubstitutionServiceTemplate,
+                                  TranslationContext context) {
     context.addNestedFileToUsedNestedComputeType(
-       ToscaUtil.getServiceTemplateFileName(mainServiceTemplate),
-       ToscaUtil.getServiceTemplateFileName(nestedServiceTemplate),
-       newNestedNodeTypeId);
-    String indexedNodeType =
+        ToscaUtil.getServiceTemplateFileName(mainServiceTemplate),
+        ToscaUtil.getServiceTemplateFileName(nestedServiceTemplate),
+        newNestedNodeTypeId);
+    String indexedNewNestedNodeTypeId =
         handleNestedNodeTypeInGlobalSubstitutionTemplate(nodeTypeId, newNestedNodeTypeId,
             mainServiceTemplate, globalSubstitutionServiceTemplate, context);
 
-    handleSubstitutionMappingInNestedServiceTemplate(indexedNodeType, nestedServiceTemplate);
+    handleSubstitutionMappingInNestedServiceTemplate(indexedNewNestedNodeTypeId,
+        nestedServiceTemplate);
 
     context
         .updateHandledComputeType(
             ToscaUtil.getServiceTemplateFileName(mainServiceTemplate),
             ToscaUtil.getServiceTemplateFileName(nestedServiceTemplate),
             newNestedNodeTypeId);
+    return indexedNewNestedNodeTypeId;
   }
 
   private String handleNestedNodeTypeInGlobalSubstitutionTemplate(String nodeTypeId,
@@ -458,7 +532,9 @@ public class UnifiedCompositionService {
       if (Objects.isNull(nestedTemplateConsolidationData)) {
         continue;
       }
-      handleNestedNodeTemplateInMainServiceTemplate(nestedTemplateConsolidationData.getNodeTemplateId(), mainServiceTemplate, nestedServiceTemplate, context);
+      handleNestedNodeTemplateInMainServiceTemplate(
+          nestedTemplateConsolidationData.getNodeTemplateId(), mainServiceTemplate,
+          nestedServiceTemplate, context);
     }
   }
 
@@ -1566,9 +1642,29 @@ public class UnifiedCompositionService {
                                 ComputeTemplateConsolidationData computeTemplateConsolidationData,
                                 List<UnifiedCompositionData> unifiedCompositionDataList,
                                 TranslationContext context) {
-    List<String> propertiesWithIdenticalVal = consolidationService.getPropertiesWithIdenticalVal();
+
     nodeTemplate.setProperties(new HashedMap());
+    handleNodeTemplateProperties(serviceTemplate, nodeTemplate, substitutionServiceTemplate,
+        unifiedCompositionEntity, entityConsolidationDataList, computeTemplateConsolidationData,
+        unifiedCompositionDataList, context);
+    //Add enrich properties from openecomp node type as input to global and substitution ST
+    handleNodeTypeProperties(substitutionServiceTemplate,
+        entityConsolidationDataList, nodeTemplate, unifiedCompositionEntity,
+        computeTemplateConsolidationData, context);
+
+  }
 
+  private void handleNodeTemplateProperties(ServiceTemplate serviceTemplate,
+                                            NodeTemplate nodeTemplate,
+                                            ServiceTemplate substitutionServiceTemplate,
+                                            UnifiedCompositionEntity unifiedCompositionEntity,
+                                            List<EntityConsolidationData>
+                                                entityConsolidationDataList,
+                                            ComputeTemplateConsolidationData
+                                                computeTemplateConsolidationData,
+                                            List<UnifiedCompositionData> unifiedCompositionDataList,
+                                            TranslationContext context) {
+    List<String> propertiesWithIdenticalVal = consolidationService.getPropertiesWithIdenticalVal();
     for (EntityConsolidationData entityConsolidationData : entityConsolidationDataList) {
       String nodeTemplateId = entityConsolidationData.getNodeTemplateId();
       Map<String, Object> properties =
@@ -1588,7 +1684,6 @@ public class UnifiedCompositionService {
                   unifiedCompositionEntity, computeTemplateConsolidationData,
                   unifiedCompositionDataList,
                   context);
-
           //todo - define list of type which will match the node property type (instead of string)
           NodeType nodeTypeWithFlatHierarchy =
               HeatToToscaUtil.getNodeTypeWithFlatHierarchy(nodeTemplate.getType(), serviceTemplate,
@@ -1596,30 +1691,82 @@ public class UnifiedCompositionService {
           String propertyType =
               nodeTypeWithFlatHierarchy.getProperties().get(propertyEntry.getKey())
                   .getType();
+          addPropertyInputParameter(propertyType, substitutionServiceTemplate, parameterId);
+        }
+      }
+    }
+  }
+
+  private void handleNodeTypeProperties(ServiceTemplate substitutionServiceTemplate,
+                                        List<EntityConsolidationData> entityConsolidationDataList,
+                                        NodeTemplate nodeTemplate,
+                                        UnifiedCompositionEntity compositionEntity,
+                                        ComputeTemplateConsolidationData
+                                            computeTemplateConsolidationData,
+                                        TranslationContext context) {
+    ToscaAnalyzerService toscaAnalyzerService = new ToscaAnalyzerServiceImpl();
+    Optional<NodeType> enrichNodeType = Optional.empty();
+    List<String> enrichProperties = new ArrayList<>();
+
+    if (compositionEntity.equals(UnifiedCompositionEntity.Port)) {
+      enrichNodeType =
+          toscaAnalyzerService.fetchNodeType(ToscaNodeType.NETWORK_PORT,
+              context.getGlobalServiceTemplates().values());
+      enrichProperties = context.getEnrichPortResourceProperties();
+      if (!enrichNodeType.isPresent() || Objects.isNull(enrichProperties)) {
+        return;
+      }
+    } else {
+      return;
+    }
 
-          if (propertyType.equalsIgnoreCase(PropertyType.STRING.getDisplayName())
-              || propertyType.equalsIgnoreCase(PropertyType.INTEGER.getDisplayName())
-              || propertyType.equalsIgnoreCase(PropertyType.FLOAT.getDisplayName())
-              || propertyType.equalsIgnoreCase(PropertyType.BOOLEAN.getDisplayName())) {
-            parameterId
-                .ifPresent(parameterIdValue -> addInputParameter(parameterIdValue,
-                    PropertyType.LIST.getDisplayName(),
-                    DataModelUtil
-                        .createEntrySchema(propertyType.toLowerCase(), null, null),
-                    substitutionServiceTemplate));
-          } else {
-            parameterId
-                .ifPresent(parameterIdValue -> addInputParameter(parameterIdValue,
-                    PropertyType.LIST.getDisplayName(),
-                    DataModelUtil
-                        .createEntrySchema(PropertyTypeExt.JSON.getDisplayName(), null, null),
-                    substitutionServiceTemplate));
+    Map<String, Object> nodeTemplateProperties = nodeTemplate.getProperties();
+    Map<String, PropertyDefinition> enrichNodeTypeProperties = enrichNodeType.get().getProperties();
+    if (Objects.nonNull(enrichNodeTypeProperties)) {
+      for (String enrichPropertyName : enrichProperties) {
+        if (!nodeTemplateProperties.containsKey(enrichPropertyName)) {
+          for (EntityConsolidationData entityConsolidationData : entityConsolidationDataList) {
+            String nodeTemplateId = entityConsolidationData.getNodeTemplateId();
+            String inputParamId =
+                getParameterId(nodeTemplateId, nodeTemplate, enrichPropertyName,
+                    compositionEntity, computeTemplateConsolidationData);
+            Map<String, List<String>> propertyVal = getPropertyValueInputParam(nodeTemplateId,
+                nodeTemplate, inputParamId);
+            nodeTemplate.getProperties().put(enrichPropertyName, propertyVal);
+            String propertyType =
+                enrichNodeType.get().getProperties().get(enrichPropertyName).getType();
+            addPropertyInputParameter(propertyType, substitutionServiceTemplate,
+                Optional.of(inputParamId));
           }
         }
       }
     }
   }
 
+
+  private void addPropertyInputParameter(String propertyType,
+                                         ServiceTemplate substitutionServiceTemplate,
+                                         Optional<String> parameterId) {
+    if (propertyType.equalsIgnoreCase(PropertyType.STRING.getDisplayName())
+        || propertyType.equalsIgnoreCase(PropertyType.INTEGER.getDisplayName())
+        || propertyType.equalsIgnoreCase(PropertyType.FLOAT.getDisplayName())
+        || propertyType.equalsIgnoreCase(PropertyType.BOOLEAN.getDisplayName())) {
+      parameterId
+          .ifPresent(parameterIdValue -> addInputParameter(parameterIdValue,
+              PropertyType.LIST.getDisplayName(),
+              DataModelUtil
+                  .createEntrySchema(propertyType.toLowerCase(), null, null),
+              substitutionServiceTemplate));
+    } else {
+      parameterId
+          .ifPresent(parameterIdValue -> addInputParameter(parameterIdValue,
+              PropertyType.LIST.getDisplayName(),
+              DataModelUtil
+                  .createEntrySchema(PropertyTypeExt.JSON.getDisplayName(), null, null),
+              substitutionServiceTemplate));
+    }
+  }
+
   private void handleConsolidationEntitiesRequirementConnectivity(String nodeTemplateId,
                                                                   NodeTemplate nodeTemplate,
                                                                   ServiceTemplate
@@ -1716,17 +1863,24 @@ public class UnifiedCompositionService {
         unifiedCompositionDataList, context)) {
       return Optional.empty();
     }
-
-    Map<String, List<String>> propertyVal = new HashMap<>();
-    List<String> getInputFuncParams = new ArrayList<>();
     String inputParamId =
         getParameterId(nodeTemplateId, nodeTemplate, propertyEntry.getKey(), compositionEntity,
             computeTemplateConsolidationData);
+    Map<String, List<String>> propertyVal = getPropertyValueInputParam(nodeTemplateId,
+        nodeTemplate, inputParamId);
+    nodeTemplate.getProperties().put(propertyEntry.getKey(), propertyVal);
+    return Optional.of(inputParamId);
+  }
+
+  private Map<String, List<String>> getPropertyValueInputParam(String nodeTemplateId,
+                                                               NodeTemplate nodeTemplate,
+                                                               String inputParamId) {
+    Map<String, List<String>> propertyVal = new HashMap<>();
+    List<String> getInputFuncParams = new ArrayList<>();
     getInputFuncParams.add(inputParamId);
     getInputFuncParams.add(ToscaConstants.INDEX_VALUE_PROPERTY_NAME);
     propertyVal.put(ToscaFunctions.GET_INPUT.getDisplayName(), getInputFuncParams);
-    nodeTemplate.getProperties().put(propertyEntry.getKey(), propertyVal);
-    return Optional.of(inputParamId);
+    return propertyVal;
   }
 
   private boolean handleGetAttrFromConsolidationNodes(
@@ -1863,7 +2017,8 @@ public class UnifiedCompositionService {
             + getComputeTypeSuffix(nodeTemplate.getType()) + "_" + propertyId;
       case Port:
         String portType = ConsolidationDataUtil.getPortType(nodeTemplateId);
-        if (computeTemplateConsolidationData.getPorts().get(portType).size() > 1) {
+        if (Objects.isNull(computeTemplateConsolidationData)
+            || computeTemplateConsolidationData.getPorts().get(portType).size() > 1) {
           return UnifiedCompositionEntity.Port.name().toLowerCase() + "_" + nodeTemplateId + "_"
               + propertyId;
         }
@@ -2015,7 +2170,13 @@ public class UnifiedCompositionService {
         default:
           break;
       }
-      abstractSubstituteProperties.put(substitutionTemplateInputName, abstractPropertyValue);
+      //Add the property only if it has at least one non-null value
+      for (Object val : abstractPropertyValue) {
+        if (Objects.nonNull(val)) {
+          abstractSubstituteProperties.put(substitutionTemplateInputName, abstractPropertyValue);
+          break;
+        }
+      }
     }
     return Optional.ofNullable(abstractSubstituteProperties);
   }
@@ -2184,7 +2345,8 @@ public class UnifiedCompositionService {
         context.getHandledNestedComputeNodeTemplateIndex(mainServiceTemplateName,
             newNestedNodeTypeId);
     String newNodeTemplateId =
-        Constants.ABSTRACT_NODE_TEMPLATE_ID_PREFIX + getComputeTypeSuffix(newNestedNodeTypeId) + "_" + index;
+        Constants.ABSTRACT_NODE_TEMPLATE_ID_PREFIX + getComputeTypeSuffix(newNestedNodeTypeId) +
+            "_" + index;
 
     nestedNodeTemplate.setType(newNestedNodeTypeId);
     mainServiceTemplate.getTopology_template().getNode_templates().remove(nestedNodeTemplateId);
@@ -2388,7 +2550,9 @@ public class UnifiedCompositionService {
     if (propertyName.isPresent()) {
       NodeTemplate portNodeTemplate = DataModelUtil.getNodeTemplate(serviceTemplate,
           portNodeTemplateId);
-      return getPropertyValueFromNodeTemplate(propertyName.get(), portNodeTemplate);
+      if (Objects.nonNull(portNodeTemplate)) {
+        return getPropertyValueFromNodeTemplate(propertyName.get(), portNodeTemplate);
+      }
     }
     return Optional.empty();
   }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetAttrImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetAttrImpl.java
index cc188d71a6..823daa53c8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetAttrImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/functiontranslation/FunctionTranslationGetAttrImpl.java
@@ -276,7 +276,7 @@ public class FunctionTranslationGetAttrImpl implements FunctionTranslation {
           .getPortTemplateConsolidationData(context, serviceTemplate, resourceId));
     } else if (HeatToToscaUtil.isNestedResource(resource)) {
       return Optional.of(ConsolidationDataUtil
-          .getNestedTemplateConsolidationData(context, serviceTemplate, resourceId));
+          .getNestedTemplateConsolidationData(context, serviceTemplate, heatFileName, resourceId));
     }
     return Optional.empty();
   }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-heatToToscaMapping.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-heatToToscaMapping.json
index 384847351e..d329b92b9f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-heatToToscaMapping.json
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-heatToToscaMapping.json
@@ -74,7 +74,7 @@
       },
       "attributes": {
         "name": "name",
-        "virtual_machine_intefrace_mac_addresses": "virtual_machine_intefrace_mac_addresses",
+        "virtual_machine_interface_mac_addresses": "virtual_machine_interface_mac_addresses",
         "virtual_machine_interface_mac_addresses#virtual_machine_interface_mac_addresses_mac_address": "mac_address",
         "virtual_network_refs": "virtual_network_refs",
         "port_tuple_refs": "port_tuple_refs",
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-mandatory-unifiedModel.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-mandatory-unifiedModel.json
index d4df0699f5..2b8f484705 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-mandatory-unifiedModel.json
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-mandatory-unifiedModel.json
@@ -26,6 +26,17 @@
       "enable": true
     }
   },
+  "enrichPortResourceProperties": [
+      "network_role_tag",
+      "mac_requirements",
+      "vlan_requirements",
+      "ip_requirements",
+      "network_role",
+      "order",
+      "exCP_naming",
+      "subnetpoolid"
+    ]
+  ,
   "_config": {
     "namespace": "mandatoryUnifiedModel"
   }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java
index 0001ec8d54..9f3232eaca 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java
@@ -25,7 +25,18 @@ public class UnifiedCompositionNestedSingleComputeFullTest extends BaseFullTrans
     }
 
     @Test
+    public void testNestedWithOneComputeSamePortType() throws IOException {
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
     public void testOneNestedWithTwoComputesOfSameType() throws IOException {
+        //Not pattern 4 (Complex VFC)
         inputFilesPath =
             "/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/in";
         outputFilesPath =
@@ -36,6 +47,7 @@ public class UnifiedCompositionNestedSingleComputeFullTest extends BaseFullTrans
 
     @Test
     public void testOneNestedWithTwoDiffComputeTypes() throws IOException {
+        //Not pattern 4 (Complex VFC)
         inputFilesPath =
             "/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/in";
         outputFilesPath =
@@ -124,6 +136,7 @@ public class UnifiedCompositionNestedSingleComputeFullTest extends BaseFullTrans
 
     @Test
     public void testMultiLevelNestedComposition() throws IOException {
+        //Not pattern 4 (Multi level Complex VFC)
         inputFilesPath =
             "/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/in";
         outputFilesPath =
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml
index c47881c827..19e88a77fb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml
@@ -130,32 +130,22 @@ topology_template:
     service_instance1:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
index b3fd08ad7f..0f74dfe252 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
@@ -250,32 +250,22 @@ topology_template:
     service_instance3:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
   groups:
     service_instance3_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
index 031d40e78f..bb8a6c0324 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
@@ -250,32 +250,22 @@ topology_template:
     service_instance4:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
   groups:
     service_instance4_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
index a80565137c..72b97b69a9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
@@ -130,32 +130,22 @@ topology_template:
     service_instance1:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
index 1ba7cd1567..1798f33fde 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
@@ -130,32 +130,22 @@ topology_template:
     service_instance2:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
index 3fc99fd2e7..f4dda7cefd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
@@ -51,7 +51,77 @@ topology_template:
           get_input: Internal1_forwarding_mode
         network_name:
           get_input: Internal1_net_name
-    test_nested:
+    test_nested0:
+      type: org.openecomp.resource.abstract.nodes.heat.OCS-fw
+      directives:
+      - substitutable
+      properties:
+        network_param2: Internal2-net
+        service_template_filter:
+          substitute_service_template: OCS-fwServiceTemplate.yaml
+        network_param1: Internal1-net
+      requirements:
+      - link_port_0_service_instance2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_1_service_instance2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_2_service_instance2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_0_service_instance1:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_1_service_instance1:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_2_service_instance1:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_0_service_instance1_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_1_service_instance1_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_2_service_instance1_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_0_service_instance4_test_nested3_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_1_service_instance4_test_nested3_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_2_service_instance4_test_nested3_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_0_service_instance3_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_1_service_instance3_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal1-net
+          relationship: tosca.relationships.network.LinksTo
+      - link_port_2_service_instance3_test_nested2:
+          capability: tosca.capabilities.network.Linkable
+          node: Internal2-net
+          relationship: tosca.relationships.network.LinksTo
+    test_nested1:
       type: org.openecomp.resource.abstract.nodes.heat.OCS-fw
       directives:
       - substitutable
@@ -130,7 +200,7 @@ topology_template:
       members:
       - Internal2-net
       - Internal1-net
-      - test_nested
+      - test_nested0
     addOn_group:
       type: org.openecomp.groups.heat.HeatStack
       properties:
@@ -139,4 +209,4 @@ topology_template:
       members:
       - Internal2-net
       - Internal1-net
-      - test_nested
\ No newline at end of file
+      - test_nested1
\ 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/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml
index c47881c827..19e88a77fb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance1ServiceTemplate.yaml
@@ -130,32 +130,22 @@ topology_template:
     service_instance1:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
index b3fd08ad7f..0f74dfe252 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw2_service_instance3ServiceTemplate.yaml
@@ -250,32 +250,22 @@ topology_template:
     service_instance3:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
   groups:
     service_instance3_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
index 031d40e78f..bb8a6c0324 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw3_service_instance4ServiceTemplate.yaml
@@ -250,32 +250,22 @@ topology_template:
     service_instance4:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
   groups:
     service_instance4_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
index a80565137c..72b97b69a9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance1ServiceTemplate.yaml
@@ -130,32 +130,22 @@ topology_template:
     service_instance1:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
index 1ba7cd1567..1798f33fde 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/OCS-fw_service_instance2ServiceTemplate.yaml
@@ -130,32 +130,22 @@ topology_template:
     service_instance2:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml
index 2785688607..7747ff6719 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/addOn.yml
@@ -30,7 +30,7 @@ resources:
       forwarding_mode: { get_param: Internal1_forwarding_mode }
       shared: { get_param: Internal1_shared }
 
-  test_nested:
+  test_nested1:
     type: OCS-fw.yml
     properties:
       network_param1: { get_resource: Internal1-net}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/base.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/base.yml
index 2785688607..235cf5e4cf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/base.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/inputfiles/base.yml
@@ -30,7 +30,7 @@ resources:
       forwarding_mode: { get_param: Internal1_forwarding_mode }
       shared: { get_param: Internal1_shared }
 
-  test_nested:
+  test_nested0:
     type: OCS-fw.yml
     properties:
       network_param1: { get_resource: Internal1-net}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
index 69d73f9034..9c7de5309f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
@@ -130,32 +130,22 @@ topology_template:
     service_instance_1:
       type: org.openecomp.resource.vfc.nodes.heat.compute_service_template_1
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
index 1a0f590d58..6ccd3c4a0e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
@@ -130,32 +130,22 @@ topology_template:
     service_instance_2:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml
index 53cb41cc75..c7685c951b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml
@@ -294,32 +294,22 @@ topology_template:
     service_instance:
       type: org.openecomp.resource.vfc.nodes.heat.st
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
   groups:
     service_instance_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
index de34c8fba8..413aa7b724 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_1ServiceTemplate.yaml
@@ -130,32 +130,22 @@ topology_template:
     service_instance_1:
       type: org.openecomp.resource.vfc.nodes.heat.compute_service_template
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
index 818e411705..a20cb55608 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/OCS-fw_service_instance_2ServiceTemplate.yaml
@@ -130,32 +130,22 @@ topology_template:
     service_instance_2:
       type: org.openecomp.resource.vfc.nodes.heat.compute_service_template
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
     port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
       properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml
index 1980b18393..e99b179375 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/OCS-fw_service_instanceServiceTemplate.yaml
@@ -330,32 +330,22 @@ topology_template:
     service_instance:
       type: org.openecomp.resource.vfc.nodes.heat.compute_service_template
       properties:
-        availability_zone:
-          get_input: availability_zone
-        static_routes_list:
-          get_input: static_routes_list
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        ordered_interfaces:
-          get_input: ordered_interfaces
         flavor:
           get_input: flavor
         image_name:
           get_input: image_name
+        availability_zone:
+          get_input: availability_zone
         service_type:
           get_input: service_type
-        service_interface_type_list:
-          get_input: service_interface_type_list
+        availability_zone_enable:
+          get_input: availability_zone_enable
+        service_template_name:
+          get_input: service_template_name
         service_instance_name:
           get_input: service_instance_name
-        interface_list:
-          get_input: interface_list
         service_mode:
           get_input: service_mode
-        shared_ip_list:
-          get_input: shared_ip_list
   groups:
     service_instance_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 549e488839..3f0bbea5ee 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,30 +60,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -399,6 +435,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -421,30 +487,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -790,6 +862,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -812,30 +914,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role_tag:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
index 700ca62ca3..b3be41a76f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
@@ -77,6 +77,14 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 2
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -90,14 +98,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - packet_internal_network
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 2
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
@@ -118,6 +118,14 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -131,14 +139,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - packet_internal_network
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
@@ -159,6 +159,14 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -172,14 +180,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - packet_internal_network
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml
index 5ef1764a63..6a96d70747 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,26 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -77,14 +107,38 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml
index a0da89fcd1..1efd8dcca0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,26 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -77,14 +107,38 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml
index 8e6fc1636e..08e5895c0e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,26 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -77,14 +107,38 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 89cc273c46..b85ce67d05 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +60,36 @@ node_types:
         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_pd_server_availability_zone:
+      port_pd01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_name:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -411,6 +441,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -433,36 +493,36 @@ node_types:
         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_pd_server_availability_zone:
+      port_pd01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_name:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -808,6 +868,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -830,36 +920,36 @@ node_types:
         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_pd_server_availability_zone:
+      port_pd01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_name:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
index e320ad820d..89aa2d4fbf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
@@ -171,6 +171,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_attribute:
+          - abstract_pd_server_0
+          - pd_server_show
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 2
+        vm_flavor_name:
+          get_attribute:
+          - network_policy_server
+          - name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -184,18 +196,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
-        compute_pd_server_availability_zone:
-        - get_attribute:
-          - abstract_pd_server_0
-          - pd_server_show
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 2
-        vm_flavor_name:
-          get_attribute:
-          - network_policy_server
-          - name
         port_pd01_port_network_role_tag:
         - oam
         compute_pd_server_user_data_format:
@@ -218,6 +218,16 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 0
+        vm_flavor_name:
+          get_attribute:
+          - network_policy_server
+          - name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -231,16 +241,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_attribute:
-          - network_policy_server
-          - name
         port_pd01_port_network_role_tag:
         - oam
         compute_pd_server_user_data_format:
@@ -258,6 +258,16 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        vm_flavor_name:
+          get_attribute:
+          - network_policy_server
+          - name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -271,16 +281,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        vm_flavor_name:
-          get_attribute:
-          - network_policy_server
-          - name
         port_pd01_port_network_role_tag:
         - oam
         compute_pd_server_user_data_format:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml
index afa6a85603..3d11cad564 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_pd_server_name:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role:
+      type: list
       required: true
+      entry_schema:
+        type: string
     port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,6 +107,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -94,6 +127,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml
index 5b0eb7e992..1efd8dcca0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_pd_server_name:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role:
+      type: list
       required: true
+      entry_schema:
+        type: string
     port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,6 +107,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -94,6 +127,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml
index 1b487934d1..08e5895c0e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_pd_server_name:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role:
+      type: list
       required: true
+      entry_schema:
+        type: string
     port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,6 +107,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -94,6 +127,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 549e488839..3f0bbea5ee 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,30 +60,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -399,6 +435,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -421,30 +487,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -790,6 +862,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -812,30 +914,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role_tag:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml
index db618f7af0..4187b3bb39 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml
@@ -76,6 +76,14 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 2
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -89,14 +97,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - packet_external_network
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 2
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
@@ -122,6 +122,14 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -135,14 +143,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - packet_internal_network
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
@@ -163,6 +163,14 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -176,14 +184,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - packet_internal_network
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml
index 5ef1764a63..6a96d70747 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,26 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -77,14 +107,38 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml
index a0da89fcd1..1efd8dcca0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,26 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -77,14 +107,38 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml
index 8e6fc1636e..08e5895c0e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,26 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -77,14 +107,38 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index da7b5979f9..a921a8e328 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -926,29 +926,92 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      server_group:
-        type: string
-        required: true
-        status: SUPPORTED
-      connectivityChk:
-        type: json
+      port_pcm_port_0_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      oam_net_gw:
-        type: string
-        description: CPS network gateway
+      port_pcm_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      pcm_server_name:
+        type: string
+        description: PCRF CM server name
+        required: true
+        status: SUPPORTED
+      cps_net_mask:
+        type: string
+        description: CPS network mask
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      oam_net_name:
+        type: string
+        description: OAM network name
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      server_group:
+        type: string
+        required: true
+        status: SUPPORTED
+      connectivityChk:
+        type: json
+        required: true
+        status: SUPPORTED
+      oam_net_gw:
+        type: string
+        description: CPS network gateway
+        required: true
+        status: SUPPORTED
       security_group_name:
         type: string
         description: the name of security group
@@ -959,6 +1022,12 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
@@ -969,21 +1038,11 @@ node_types:
         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
@@ -994,11 +1053,12 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      oam_net_name:
-        type: string
-        description: OAM network name
+      port_pcm_port_1_order:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -1421,7 +1481,13 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c1_scalling_instance:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1c1_t1_port_fixed_ips:
+      port_1c1_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -1433,24 +1499,80 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_ip_requirements:
+      port_1c1_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c1_t1_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t1_port_mac_requirements:
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_1c1_scalling_instance_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t2_port_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t2_port_network_role_tag:
+      port_1c1_t2_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1c1_t1_port_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t1_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1459,80 +1581,84 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1c1_t2_port_mac_requirements:
+      port_1c1_t2_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_flavor_name:
-        type: string
+          type: string
+      port_1c1_t2_port_order:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c1_t2_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_1c1_scalling_instance_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_ip_requirements:
+      port_1c1_t2_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_1c1_t2_port_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
       compute_1c1_scalling_instance_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_1c1_scalling_instance_metadata:
+      port_1c1_t2_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_1c1_scalling_instance_name:
+      compute_1c1_scalling_instance_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1c1_t1_port_name:
+          type: json
+      port_1c1_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_network:
+      port_1c1_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_fixed_ips:
+      port_1c1_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1c1_t2_port_network:
+          type: string
+      port_1c1_t1_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: integer
     attributes:
       1c1_scalling_instance_1c1_t1_port_tenant_id:
         type: list
@@ -1972,6 +2098,74 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1a_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t2_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_a_single_1a_availability_zone:
         type: list
         required: true
@@ -1992,50 +2186,48 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1a_t1_port_ip_requirements:
+      port_1a_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1a_t2_port_network_role_tag:
+          type: string
+      port_1a_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1a_t1_port_order:
+        type: list
         required: true
         status: SUPPORTED
-      port_1a_t2_port_network:
+        entry_schema:
+          type: integer
+      port_1a_t2_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1a_t1_port_mac_requirements:
+          type: json
+      port_1a_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1a_t1_port_network:
+      port_1a_t2_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1a_t2_port_ip_requirements:
+      port_1a_t2_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: integer
       compute_a_single_1a_user_data_format:
         type: list
         required: true
@@ -2482,6 +2674,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_b_single_1b_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t2_port_mac_requirements:
         type: list
         required: true
@@ -2508,16 +2768,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_flavor_name:
-        type: string
+      port_1b_t2_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_1b_t1_port_value_specs:
         type: list
         required: true
@@ -2530,16 +2792,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t1_port_ip_requirements:
+      port_1b_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -2552,12 +2810,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_b_single_1b_user_data_format:
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       port_1b_t1_port_network:
         type: list
         required: true
@@ -2998,12 +3256,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3018,12 +3350,6 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       compute_1c2_catalog_instance_metadata:
         type: list
         required: true
@@ -3036,10 +3362,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1c2_t1_port_exCP_naming:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -3052,11 +3380,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -3514,12 +3838,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3534,22 +3932,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
+      compute_1c2_catalog_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c2_catalog_instance_name:
+      port_1c2_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -3562,11 +3956,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -4024,6 +4414,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_b_single_1b_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t2_port_mac_requirements:
         type: list
         required: true
@@ -4050,32 +4508,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1b_t1_port_ip_requirements:
+      port_1b_t2_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
+      port_1b_t1_port_network_role_tag:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_b_single_1b_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1b_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -4088,12 +4550,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_b_single_1b_user_data_format:
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       compute_b_single_1b_name:
         type: list
         required: true
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 7a12426fa6..700c94ba91 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
@@ -143,6 +143,52 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_1c1_scalling_instance_user_data_format:
+        - RAW2
+        - RAW1
+        port_1c1_t2_port_network_role_tag:
+        - ppds
+        - ppds
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1c1_t1_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: true
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: true
+            floating_ip_count_required:
+              is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        compute_1c1_scalling_instance_name:
+        - get_input:
+          - 1c1_scalling_instance_names
+          - 2
+        - get_input:
+          - 1c1_scalling_instance_names
+          - 1
+        port_1c1_t1_port_name:
+        - 1c1_t1_port_1
+        - 1c1_t1_port_0
+        port_1c1_t1_port_network:
+        - 1c1_scalling_instance_network
+        - 1c1_scalling_instance_network
+        port_1c1_t2_port_fixed_ips:
+        - - ip_address:
+              get_input:
+              - myIPs
+              - 4
+        - - ip_address:
+              get_input:
+              - myIPs
+              - 2
+        port_1c1_t2_port_network:
+        - get_input: ppds_net_name
+        - get_input: ppds_net_name
         port_1c1_t1_port_fixed_ips:
         - - ip_address:
               get_input:
@@ -152,9 +198,6 @@ topology_template:
               get_input:
               - myIPs
               - 1
-        compute_1c1_scalling_instance_user_data_format:
-        - RAW2
-        - RAW1
         port_1c1_t2_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -171,35 +214,17 @@ topology_template:
             is_required: false
         - mac_count_required:
             is_required: false
-        port_1c1_t2_port_network_role_tag:
-        - ppds
-        - ppds
         port_1c1_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
         - mac_count_required:
             is_required: false
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_1c1_scalling_instance_availability_zone:
         - get_input: availabilityzone_name
         - get_input: availabilityzone_name
-        port_1c1_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
         port_1c1_t2_port_name:
         - 1c1_t2_port_1
         - 1c1_t2_port_0
-        vm_image_name:
-          get_input: pd_image_name
         compute_1c1_scalling_instance_scheduler_hints:
         - group: BE_Affinity_group
         - group: BE_Affinity_group
@@ -233,31 +258,6 @@ topology_template:
             get_attribute:
             - abstract_b_single_1b_0
             - b_single_1b_instance_name
-        compute_1c1_scalling_instance_name:
-        - get_input:
-          - 1c1_scalling_instance_names
-          - 2
-        - get_input:
-          - 1c1_scalling_instance_names
-          - 1
-        port_1c1_t1_port_name:
-        - 1c1_t1_port_1
-        - 1c1_t1_port_0
-        port_1c1_t1_port_network:
-        - 1c1_scalling_instance_network
-        - 1c1_scalling_instance_network
-        port_1c1_t2_port_fixed_ips:
-        - - ip_address:
-              get_input:
-              - myIPs
-              - 4
-        - - ip_address:
-              get_input:
-              - myIPs
-              - 2
-        port_1c1_t2_port_network:
-        - get_input: ppds_net_name
-        - get_input: ppds_net_name
         service_template_filter:
           substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
           count: 2
@@ -276,6 +276,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1b_t1_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        compute_b_single_1b_user_data_format:
+        - RAW
         port_1b_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -289,16 +301,6 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        port_1b_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        vm_image_name:
-          get_input: pd_image_name
         compute_b_single_1b_metadata:
         - connectivityTo4PNested:
             get_attribute:
@@ -329,8 +331,6 @@ topology_template:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network
-        compute_b_single_1b_user_data_format:
-        - RAW
         compute_b_single_1b_name:
         - get_input:
           - b_single_1b_names
@@ -358,13 +358,23 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_1c2_catalog_instance_availability_zone:
+        - get_input: availabilityzone_name
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
         port_1c2_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
-        compute_1c2_catalog_instance_availability_zone:
-        - get_input: availabilityzone_name
         compute_1c2_catalog_instance_metadata:
         - connectivityTo4PNested:
             get_attribute:
@@ -398,21 +408,11 @@ topology_template:
         - get_input:
           - 1c2_catalog_instance_names
           - 1
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
         port_1c2_t1_port_network_role_tag:
@@ -443,32 +443,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_1c2_catalog_instance_availability_zone:
+        - get_input: availabilityzone_name
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
         port_1c2_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
-        compute_1c2_catalog_instance_availability_zone:
-        - get_input: availabilityzone_name
         compute_1c2_catalog_instance_name:
         - get_input:
           - 1c2_catalog_instance_names
           - 2
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - get_attribute:
           - abstract_1c2_catalog_instance_0
@@ -661,10 +661,6 @@ topology_template:
             get_attribute:
             - abstract_1c1_scalling_instance
             - 1c1_scalling_instance_1c1_t2_port_tenant_id
-        compute_a_single_1a_availability_zone:
-        - get_input: availabilityzone_name
-        compute_a_single_1a_scheduler_hints:
-        - group: BE_Affinity_group
         port_1a_t1_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -690,6 +686,10 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
+        compute_a_single_1a_availability_zone:
+        - get_input: availabilityzone_name
+        compute_a_single_1a_scheduler_hints:
+        - group: BE_Affinity_group
         compute_a_single_1a_user_data_format:
         - RAW
         compute_a_single_1a_name:
@@ -877,6 +877,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1b_t1_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        compute_b_single_1b_user_data_format:
+        - RAW
         port_1b_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -890,29 +902,17 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1b_t1_port_value_specs:
         - get_attribute:
           - abstract_a_single_1a
           - a_single_1a_1a_t1_port_tenant_id
         port_1b_t1_port_network_role_tag:
         - oam
-        port_1b_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        vm_image_name:
-          get_input: pd_image_name
         port_1b_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network
-        compute_b_single_1b_user_data_format:
-        - RAW
         port_1b_t1_port_network:
         - get_input: oam_net_name
         compute_b_single_1b_name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index aa6bcaf443..f6b0a50917 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -11,7 +11,12 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_1c1_t1_port_fixed_ips:
+    port_1c1_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -21,21 +26,67 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1c1_t2_port_ip_requirements:
+    port_1c1_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c1_t1_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1c1_t1_port_mac_requirements:
+    vm_image_name:
+      type: string
+      required: true
+    compute_1c1_scalling_instance_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t2_port_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1c1_t2_port_network_role_tag:
+    port_1c1_t2_port_network:
       type: list
       required: true
       entry_schema:
         type: string
+    port_1c1_t1_port_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t1_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -43,79 +94,107 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_1c1_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     port_1c1_t2_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
-      required: true
     compute_1c1_scalling_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_ip_requirements:
+    port_1c1_t2_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_1c1_t2_port_name:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
     compute_1c1_scalling_instance_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_1c1_scalling_instance_metadata:
+    port_1c1_t2_port_exCP_naming:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_1c1_scalling_instance_name:
+    compute_1c1_scalling_instance_metadata:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1c1_t1_port_name:
+        type: json
+    port_1c1_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_network:
+    port_1c1_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t2_port_fixed_ips:
+    port_1c1_t1_port_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1c1_t2_port_network:
+        type: string
+    port_1c1_t1_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: integer
   node_templates:
     1c1_scalling_instance_1c1_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c1_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c1_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c1_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c1_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c1_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c1_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c1_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c1_t1_port_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_1c1_t1_port_fixed_ips
@@ -163,6 +242,14 @@ topology_template:
     1c1_scalling_instance_1c1_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c1_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c1_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c1_t2_port_ip_requirements
@@ -175,6 +262,18 @@ topology_template:
           get_input:
           - port_1c1_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c1_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c1_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c1_t2_port_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_1c1_t2_port_fixed_ips
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index 67305b71ce..7a439484d6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -11,11 +11,72 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c2_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_1c2_catalog_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c2_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1c2_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c2_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1c2_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1c2_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -28,11 +89,6 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_1c2_catalog_instance_availability_zone:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     compute_1c2_catalog_instance_metadata:
       type: list
       required: true
@@ -43,9 +99,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_1c2_t1_port_exCP_naming:
+      type: list
       required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_network:
       type: list
       required: true
@@ -56,10 +114,7 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
-    port_1c2_t2_port_ip_requirements:
+    port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -115,14 +170,38 @@ topology_template:
     1c2_catalog_instance_1c2_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c2_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c2_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t2_port_network
@@ -135,6 +214,14 @@ topology_template:
     1c2_catalog_instance_1c2_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t1_port_ip_requirements
@@ -147,6 +234,18 @@ topology_template:
           get_input:
           - port_1c2_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t1_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 213939c88e..ab88e26fa7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -11,11 +11,72 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c2_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_1c2_catalog_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c2_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1c2_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c2_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1c2_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1c2_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -28,19 +89,16 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_1c2_catalog_instance_availability_zone:
+    compute_1c2_catalog_instance_name:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c2_catalog_instance_name:
+    port_1c2_t1_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
+        type: json
     port_1c2_t1_port_network:
       type: list
       required: true
@@ -51,10 +109,7 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
-    port_1c2_t2_port_ip_requirements:
+    port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -106,14 +161,38 @@ topology_template:
     1c2_catalog_instance_1c2_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c2_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c2_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t2_port_network
@@ -126,6 +205,14 @@ topology_template:
     1c2_catalog_instance_1c2_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t1_port_ip_requirements
@@ -138,6 +225,18 @@ topology_template:
           get_input:
           - port_1c2_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t1_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
index 409bf1d35f..c0ea9ef793 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
@@ -16,6 +16,62 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_1a_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1a_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t2_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t1_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_image_name:
+      type: string
+      required: true
+    port_1a_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_a_single_1a_availability_zone:
       type: list
       required: true
@@ -33,42 +89,41 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_1a_t1_port_ip_requirements:
+    port_1a_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1a_t2_port_network_role_tag:
+        type: string
+    port_1a_t1_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_1a_t1_port_order:
+      type: list
       required: true
-    port_1a_t2_port_network:
+      entry_schema:
+        type: integer
+    port_1a_t2_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1a_t1_port_mac_requirements:
+        type: json
+    port_1a_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1a_t1_port_network:
+    port_1a_t2_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
-    port_1a_t2_port_ip_requirements:
+    port_1a_t2_port_order:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: integer
     compute_a_single_1a_user_data_format:
       type: list
       required: true
@@ -88,14 +143,38 @@ topology_template:
     a_single_1a_1a_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1a_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1a_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1a_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1a_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1a_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1a_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1a_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1a_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1a_t1_port_network
@@ -135,6 +214,14 @@ topology_template:
     a_single_1a_1a_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1a_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1a_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1a_t2_port_ip_requirements
@@ -147,6 +234,18 @@ topology_template:
           get_input:
           - port_1a_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1a_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1a_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1a_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1a_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml
index 97428c699a..1b859d537f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -11,6 +11,62 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1b_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1b_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_b_single_1b_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1b_t2_port_mac_requirements:
       type: list
       required: true
@@ -33,27 +89,31 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t2_port_ip_requirements:
+    port_1b_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
-      required: true
-    port_1b_t1_port_ip_requirements:
+    port_1b_t2_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
+    port_1b_t1_port_network_role_tag:
+      type: list
       required: true
+      entry_schema:
+        type: string
     compute_b_single_1b_metadata:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1b_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1b_t1_port_mac_requirements:
       type: list
       required: true
@@ -64,11 +124,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    compute_b_single_1b_user_data_format:
+    port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
     compute_b_single_1b_name:
       type: list
       required: true
@@ -105,14 +165,38 @@ topology_template:
     b_single_1b_1b_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t1_port_subnetpoolid
+          - index_value
         network:
           get_attribute:
           - b_single_1b
@@ -125,14 +209,38 @@ topology_template:
     b_single_1b_1b_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 78243244fa..1feba0fca7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -11,6 +11,62 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1b_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1b_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_b_single_1b_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1b_t2_port_mac_requirements:
       type: list
       required: true
@@ -33,14 +89,16 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t2_port_ip_requirements:
+    port_1b_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
+    port_1b_t2_port_ip_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     port_1b_t1_port_value_specs:
       type: list
       required: true
@@ -51,14 +109,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1b_t1_port_ip_requirements:
+    port_1b_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
-    vm_image_name:
-      type: string
-      required: true
+        type: string
     port_1b_t1_port_mac_requirements:
       type: list
       required: true
@@ -69,11 +124,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    compute_b_single_1b_user_data_format:
+    port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
     port_1b_t1_port_network:
       type: list
       required: true
@@ -115,6 +170,14 @@ topology_template:
           get_input:
           - port_1b_t1_port_value_specs
           - index_value
+        exCP_naming:
+          get_input:
+          - port_1b_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t1_port_ip_requirements
@@ -127,6 +190,18 @@ topology_template:
           get_input:
           - port_1b_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t1_port_network
@@ -139,14 +214,38 @@ topology_template:
     b_single_1b_1b_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
index d6dd992034..a8e64880b2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,32 +11,90 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    server_group:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    availabilityzone_name:
+      label: availabilityzone name
       hidden: false
       immutable: false
       type: string
-    connectivityChk:
+      description: availabilityzone name
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    pcm_image_name:
+      label: image name
       hidden: false
       immutable: false
-      type: json
-    availabilityzone_name:
-      label: availabilityzone name
+      type: string
+      description: PCRF CM image name
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    pcm_server_name:
+      label: PCRF CM server name
       hidden: false
       immutable: false
       type: string
-      description: availabilityzone name
-    oam_net_gw:
-      label: CPS network gateway
+      description: PCRF CM server name
+    cps_net_mask:
+      label: CPS network mask
       hidden: false
       immutable: false
       type: string
-      description: CPS network gateway
-    pcm_image_name:
-      label: image name
+      description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    oam_net_name:
+      label: OAM network name
       hidden: false
       immutable: false
       type: string
-      description: PCRF CM image name
+      description: OAM network name
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    server_group:
+      hidden: false
+      immutable: false
+      type: string
+    connectivityChk:
+      hidden: false
+      immutable: false
+      type: json
+    oam_net_gw:
+      label: CPS network gateway
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network gateway
     security_group_name:
       label: security group name
       hidden: false
@@ -49,6 +107,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
@@ -61,24 +124,12 @@ topology_template:
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    pcm_server_name:
-      label: PCRF CM server name
-      hidden: false
-      immutable: false
-      type: string
-      description: PCRF CM server name
     cps_net_name:
       label: CPS network name
       hidden: false
       immutable: false
       type: string
       description: CPS network name
-    cps_net_mask:
-      label: CPS network mask
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network mask
     oam_net_ip:
       label: OAM network ip
       hidden: false
@@ -91,12 +142,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    oam_net_name:
-      label: OAM network name
-      hidden: false
-      immutable: false
-      type: string
-      description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -109,15 +159,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -150,15 +220,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3213f601da..536511a641 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -922,6 +922,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       server_group:
         type: string
         required: true
@@ -936,6 +942,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -951,11 +963,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -986,11 +1022,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
@@ -1413,7 +1473,13 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c1_scalling_instance:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1c1_t1_port_fixed_ips:
+      port_1c1_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -1425,24 +1491,80 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_ip_requirements:
+      port_1c1_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c1_t1_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t1_port_mac_requirements:
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_1c1_scalling_instance_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t2_port_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t2_port_network_role_tag:
+      port_1c1_t2_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1c1_t1_port_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t1_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1451,74 +1573,78 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1c1_t2_port_mac_requirements:
+      port_1c1_t2_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_flavor_name:
-        type: string
+          type: string
+      port_1c1_t2_port_order:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c1_t2_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_1c1_scalling_instance_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_ip_requirements:
+      port_1c1_t2_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_1c1_t2_port_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
       compute_1c1_scalling_instance_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_1c1_scalling_instance_name:
+      port_1c1_t2_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1c1_t1_port_name:
+          type: json
+      port_1c1_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_network:
+      port_1c1_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_fixed_ips:
+      port_1c1_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1c1_t2_port_network:
+          type: string
+      port_1c1_t1_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: integer
     attributes:
       1c1_scalling_instance_instance_name:
         type: list
@@ -1947,6 +2073,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.a_single_1a:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1a_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t2_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_a_single_1a_availability_zone:
         type: list
         required: true
@@ -1967,50 +2161,48 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1a_t1_port_ip_requirements:
+      port_1a_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1a_t2_port_network_role_tag:
+          type: string
+      port_1a_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1a_t1_port_order:
+        type: list
         required: true
         status: SUPPORTED
-      port_1a_t2_port_network:
+        entry_schema:
+          type: integer
+      port_1a_t2_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1a_t1_port_mac_requirements:
+          type: json
+      port_1a_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1a_t1_port_network:
+      port_1a_t2_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1a_t2_port_ip_requirements:
+      port_1a_t2_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: integer
       compute_a_single_1a_user_data_format:
         type: list
         required: true
@@ -2457,6 +2649,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_b_single_1b_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t2_port_mac_requirements:
         type: list
         required: true
@@ -2483,32 +2743,30 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_flavor_name:
-        type: string
+      port_1b_t2_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_1b_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t1_port_ip_requirements:
+      port_1b_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -2521,12 +2779,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_b_single_1b_user_data_format:
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       port_1b_t1_port_network:
         type: list
         required: true
@@ -2967,12 +3225,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -2987,22 +3319,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
+      compute_1c2_catalog_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c2_catalog_instance_name:
+      port_1c2_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -3015,11 +3343,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -3477,12 +3801,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3497,22 +3895,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
+      compute_1c2_catalog_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c2_catalog_instance_name:
+      port_1c2_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -3525,11 +3919,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -4056,16 +4446,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t1_port_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
       compute_b_single_1b_availability_zone:
         type: list
         required: true
@@ -4086,6 +4466,62 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t2_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -4098,7 +4534,19 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -4110,16 +4558,30 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_b_single_1b_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       b_single_1b_instance_name:
         type: list
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 5108b6f4f0..68f812e15d 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
@@ -115,47 +115,14 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_1c1_t1_port_fixed_ips:
-        - - ip_address:
-              get_input:
-              - myIPs
-              - 3
-        - - ip_address:
-              get_input:
-              - myIPs
-              - 1
         compute_1c1_scalling_instance_user_data_format:
         - RAW2
         - RAW1
-        port_1c1_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
-        port_1c1_t1_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
-        - mac_count_required:
-            is_required: false
         port_1c1_t2_port_network_role_tag:
         - ppds
         - ppds
-        port_1c1_t2_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
-        - mac_count_required:
-            is_required: false
         vm_flavor_name:
           get_input: pd_flavor_name
-        compute_1c1_scalling_instance_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
         port_1c1_t1_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -167,14 +134,8 @@ topology_template:
               is_required: true
             floating_ip_count_required:
               is_required: false
-        port_1c1_t2_port_name:
-        - 1c1_t2_port_1
-        - 1c1_t2_port_0
         vm_image_name:
           get_input: pd_image_name
-        compute_1c1_scalling_instance_scheduler_hints:
-        - group: BE_Affinity_group
-        - group: BE_Affinity_group
         compute_1c1_scalling_instance_name:
         - get_input:
           - 1c1_scalling_instance_names
@@ -200,6 +161,45 @@ topology_template:
         port_1c1_t2_port_network:
         - get_input: ppds_net_name
         - get_input: ppds_net_name
+        port_1c1_t1_port_fixed_ips:
+        - - ip_address:
+              get_input:
+              - myIPs
+              - 3
+        - - ip_address:
+              get_input:
+              - myIPs
+              - 1
+        port_1c1_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: true
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: true
+            floating_ip_count_required:
+              is_required: false
+        port_1c1_t1_port_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        - mac_count_required:
+            is_required: false
+        port_1c1_t2_port_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        - mac_count_required:
+            is_required: false
+        compute_1c1_scalling_instance_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        port_1c1_t2_port_name:
+        - 1c1_t2_port_1
+        - 1c1_t2_port_0
+        compute_1c1_scalling_instance_scheduler_hints:
+        - group: BE_Affinity_group
+        - group: BE_Affinity_group
         service_template_filter:
           substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
           count: 2
@@ -225,6 +225,18 @@ topology_template:
         port_1b_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
+        compute_b_single_1b_availability_zone:
+        - get_input: availabilityzone_name
+        compute_b_single_1b_scheduler_hints:
+        - group: BE_Affinity_group
+        port_1b_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_1b_t1_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -233,25 +245,13 @@ topology_template:
               is_required: false
         vm_image_name:
           get_input: pd_image_name
-        compute_b_single_1b_availability_zone:
-        - get_input: availabilityzone_name
-        compute_b_single_1b_scheduler_hints:
-        - group: BE_Affinity_group
         port_1b_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network
-        port_1b_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_b_single_1b_user_data_format:
         - RAW
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_b_single_1b_name:
         - get_input:
           - b_single_1b_names
@@ -292,32 +292,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_1c2_catalog_instance_availability_zone:
+        - get_input: availabilityzone_name
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
         port_1c2_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
-        compute_1c2_catalog_instance_availability_zone:
-        - get_input: availabilityzone_name
         compute_1c2_catalog_instance_name:
         - get_input:
           - 1c2_catalog_instance_names
           - 1
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
         port_1c2_t1_port_network_role_tag:
@@ -352,32 +352,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_1c2_catalog_instance_availability_zone:
+        - get_input: availabilityzone_name
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
         port_1c2_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
-        compute_1c2_catalog_instance_availability_zone:
-        - get_input: availabilityzone_name
         compute_1c2_catalog_instance_name:
         - get_input:
           - 1c2_catalog_instance_names
           - 2
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - get_attribute:
           - abstract_1c2_catalog_instance_0
@@ -588,10 +588,6 @@ topology_template:
       directives:
       - substitutable
       properties:
-        compute_a_single_1a_availability_zone:
-        - get_input: availabilityzone_name
-        compute_a_single_1a_scheduler_hints:
-        - group: BE_Affinity_group
         port_1a_t1_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -617,6 +613,10 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
+        compute_a_single_1a_availability_zone:
+        - get_input: availabilityzone_name
+        compute_a_single_1a_scheduler_hints:
+        - group: BE_Affinity_group
         compute_a_single_1a_user_data_format:
         - RAW
         compute_a_single_1a_name:
@@ -780,6 +780,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1b_t1_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        compute_b_single_1b_user_data_format:
+        - RAW
         port_1b_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -793,25 +805,13 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1b_t1_port_network_role_tag:
         - oam
-        port_1b_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        vm_image_name:
-          get_input: pd_image_name
         port_1b_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network
-        compute_b_single_1b_user_data_format:
-        - RAW
         port_1b_t1_port_network:
         - get_input: oam_net_name
         compute_b_single_1b_name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index 2c43ee2c01..3a93e4c8b9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -11,7 +11,12 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_1c1_t1_port_fixed_ips:
+    port_1c1_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -21,21 +26,67 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1c1_t2_port_ip_requirements:
+    port_1c1_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c1_t1_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1c1_t1_port_mac_requirements:
+    vm_image_name:
+      type: string
+      required: true
+    compute_1c1_scalling_instance_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t2_port_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1c1_t2_port_network_role_tag:
+    port_1c1_t2_port_network:
       type: list
       required: true
       entry_schema:
         type: string
+    port_1c1_t1_port_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t1_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -43,74 +94,102 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_1c1_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     port_1c1_t2_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
-      required: true
     compute_1c1_scalling_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_ip_requirements:
+    port_1c1_t2_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_1c1_t2_port_name:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
     compute_1c1_scalling_instance_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_1c1_scalling_instance_name:
+    port_1c1_t2_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1c1_t1_port_name:
+        type: json
+    port_1c1_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_network:
+    port_1c1_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t2_port_fixed_ips:
+    port_1c1_t1_port_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1c1_t2_port_network:
+        type: string
+    port_1c1_t1_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: integer
   node_templates:
     1c1_scalling_instance_1c1_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c1_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c1_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c1_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c1_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c1_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c1_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c1_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c1_t1_port_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_1c1_t1_port_fixed_ips
@@ -154,6 +233,14 @@ topology_template:
     1c1_scalling_instance_1c1_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c1_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c1_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c1_t2_port_ip_requirements
@@ -166,6 +253,18 @@ topology_template:
           get_input:
           - port_1c1_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c1_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c1_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c1_t2_port_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_1c1_t2_port_fixed_ips
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index dd75d5837c..80b876b5ce 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -11,11 +11,72 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c2_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_1c2_catalog_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c2_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1c2_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c2_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1c2_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1c2_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -28,19 +89,16 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_1c2_catalog_instance_availability_zone:
+    compute_1c2_catalog_instance_name:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c2_catalog_instance_name:
+    port_1c2_t1_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
+        type: json
     port_1c2_t1_port_network:
       type: list
       required: true
@@ -51,10 +109,7 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
-    port_1c2_t2_port_ip_requirements:
+    port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -106,14 +161,38 @@ topology_template:
     1c2_catalog_instance_1c2_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c2_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c2_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t2_port_network
@@ -126,6 +205,14 @@ topology_template:
     1c2_catalog_instance_1c2_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t1_port_ip_requirements
@@ -138,6 +225,18 @@ topology_template:
           get_input:
           - port_1c2_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t1_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 213939c88e..ab88e26fa7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -11,11 +11,72 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c2_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_1c2_catalog_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c2_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1c2_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c2_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1c2_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1c2_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -28,19 +89,16 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_1c2_catalog_instance_availability_zone:
+    compute_1c2_catalog_instance_name:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c2_catalog_instance_name:
+    port_1c2_t1_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
+        type: json
     port_1c2_t1_port_network:
       type: list
       required: true
@@ -51,10 +109,7 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
-    port_1c2_t2_port_ip_requirements:
+    port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -106,14 +161,38 @@ topology_template:
     1c2_catalog_instance_1c2_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c2_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c2_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t2_port_network
@@ -126,6 +205,14 @@ topology_template:
     1c2_catalog_instance_1c2_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t1_port_ip_requirements
@@ -138,6 +225,18 @@ topology_template:
           get_input:
           - port_1c2_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t1_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
index dcfab01851..33152e6824 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
@@ -11,6 +11,62 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1a_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1a_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t2_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t1_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_image_name:
+      type: string
+      required: true
+    port_1a_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_a_single_1a_availability_zone:
       type: list
       required: true
@@ -28,42 +84,41 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_1a_t1_port_ip_requirements:
+    port_1a_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1a_t2_port_network_role_tag:
+        type: string
+    port_1a_t1_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_1a_t1_port_order:
+      type: list
       required: true
-    port_1a_t2_port_network:
+      entry_schema:
+        type: integer
+    port_1a_t2_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1a_t1_port_mac_requirements:
+        type: json
+    port_1a_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1a_t1_port_network:
+    port_1a_t2_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
-    port_1a_t2_port_ip_requirements:
+    port_1a_t2_port_order:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: integer
     compute_a_single_1a_user_data_format:
       type: list
       required: true
@@ -83,14 +138,38 @@ topology_template:
     a_single_1a_1a_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1a_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1a_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1a_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1a_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1a_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1a_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1a_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1a_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1a_t1_port_network
@@ -126,6 +205,14 @@ topology_template:
     a_single_1a_1a_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1a_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1a_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1a_t2_port_ip_requirements
@@ -138,6 +225,18 @@ topology_template:
           get_input:
           - port_1a_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1a_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1a_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1a_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1a_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml
index cefe2d2db0..cbfebea739 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -16,14 +16,6 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t1_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
-    vm_image_name:
-      type: string
-      required: true
     compute_b_single_1b_availability_zone:
       type: list
       required: true
@@ -41,6 +33,52 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_1b_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t2_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t1_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1b_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1b_t1_port_mac_requirements:
       type: list
       required: true
@@ -51,7 +89,17 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1b_t2_port_ip_requirements:
+    port_1b_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -61,14 +109,26 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_1b_t2_port_exCP_naming:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_b_single_1b_name:
       type: list
       required: true
       entry_schema:
         type: string
+    port_1b_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     b_single_1b:
       type: org.openecomp.resource.vfc.nodes.heat.b_single_1b
@@ -96,14 +156,38 @@ topology_template:
     b_single_1b_1b_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t1_port_subnetpoolid
+          - index_value
         network:
           get_attribute:
           - b_single_1b
@@ -116,14 +200,38 @@ topology_template:
     b_single_1b_1b_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 158df6fc9f..23f23830ac 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -11,6 +11,62 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1b_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1b_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_b_single_1b_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1b_t2_port_mac_requirements:
       type: list
       required: true
@@ -33,27 +89,26 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t2_port_ip_requirements:
+    port_1b_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
+    port_1b_t2_port_ip_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     port_1b_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1b_t1_port_ip_requirements:
+    port_1b_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
-    vm_image_name:
-      type: string
-      required: true
+        type: string
     port_1b_t1_port_mac_requirements:
       type: list
       required: true
@@ -64,11 +119,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    compute_b_single_1b_user_data_format:
+    port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
     port_1b_t1_port_network:
       type: list
       required: true
@@ -106,6 +161,14 @@ topology_template:
     b_single_1b_1b_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t1_port_ip_requirements
@@ -118,6 +181,18 @@ topology_template:
           get_input:
           - port_1b_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t1_port_network
@@ -130,14 +205,38 @@ topology_template:
     b_single_1b_1b_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
index 10064c8155..caa366f570 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     server_group:
       hidden: false
       immutable: false
@@ -27,6 +32,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -45,12 +55,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -87,12 +117,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -105,15 +155,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -146,15 +216,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5b8093e870..f0a9da57b6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -922,6 +922,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       server_group:
         type: string
         required: true
@@ -936,6 +942,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -951,11 +963,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -986,11 +1022,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
@@ -1413,7 +1473,13 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c1_scalling_instance:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1c1_t1_port_fixed_ips:
+      port_1c1_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -1425,24 +1491,80 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_ip_requirements:
+      port_1c1_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c1_t1_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t1_port_mac_requirements:
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_1c1_scalling_instance_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t2_port_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1c1_t2_port_network_role_tag:
+      port_1c1_t2_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1c1_t1_port_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t1_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1451,74 +1573,78 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1c1_t2_port_mac_requirements:
+      port_1c1_t2_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_flavor_name:
-        type: string
+          type: string
+      port_1c1_t2_port_order:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c1_t2_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_1c1_scalling_instance_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_ip_requirements:
+      port_1c1_t2_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_1c1_t2_port_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
       compute_1c1_scalling_instance_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_1c1_scalling_instance_name:
+      port_1c1_t2_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1c1_t1_port_name:
+          type: json
+      port_1c1_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_network:
+      port_1c1_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t2_port_fixed_ips:
+      port_1c1_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1c1_t2_port_network:
+          type: string
+      port_1c1_t1_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: integer
     attributes:
       1c1_scalling_instance_instance_name:
         type: list
@@ -1947,6 +2073,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.a_single_1a:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1a_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t2_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_a_single_1a_availability_zone:
         type: list
         required: true
@@ -1967,50 +2161,48 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1a_t1_port_ip_requirements:
+      port_1a_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1a_t2_port_network_role_tag:
+          type: string
+      port_1a_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1a_t1_port_order:
+        type: list
         required: true
         status: SUPPORTED
-      port_1a_t2_port_network:
+        entry_schema:
+          type: integer
+      port_1a_t2_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1a_t1_port_mac_requirements:
+          type: json
+      port_1a_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1a_t1_port_network:
+      port_1a_t2_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1a_t2_port_ip_requirements:
+      port_1a_t2_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: integer
       compute_a_single_1a_user_data_format:
         type: list
         required: true
@@ -2457,6 +2649,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_b_single_1b_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t2_port_mac_requirements:
         type: list
         required: true
@@ -2483,32 +2743,30 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_flavor_name:
-        type: string
+      port_1b_t2_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_1b_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t1_port_ip_requirements:
+      port_1b_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -2521,12 +2779,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_b_single_1b_user_data_format:
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       port_1b_t1_port_network:
         type: list
         required: true
@@ -2967,12 +3225,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -2987,22 +3319,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
+      compute_1c2_catalog_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c2_catalog_instance_name:
+      port_1c2_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -3015,11 +3343,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -3477,12 +3801,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3497,22 +3895,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
+      compute_1c2_catalog_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c2_catalog_instance_name:
+      port_1c2_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -3525,11 +3919,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -3993,16 +4383,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t1_port_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
       compute_b_single_1b_availability_zone:
         type: list
         required: true
@@ -4023,6 +4403,62 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t2_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -4035,7 +4471,19 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -4047,16 +4495,30 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_b_single_1b_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       b_single_1b_instance_name:
         type: list
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 9322fa81fc..26ab893506 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
@@ -111,47 +111,14 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_1c1_t1_port_fixed_ips:
-        - - ip_address:
-              get_input:
-              - myIPs
-              - 3
-        - - ip_address:
-              get_input:
-              - myIPs
-              - 1
         compute_1c1_scalling_instance_user_data_format:
         - RAW2
         - RAW1
-        port_1c1_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
-        port_1c1_t1_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
-        - mac_count_required:
-            is_required: false
         port_1c1_t2_port_network_role_tag:
         - ppds
         - ppds
-        port_1c1_t2_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
-        - mac_count_required:
-            is_required: false
         vm_flavor_name:
           get_input: pd_flavor_name
-        compute_1c1_scalling_instance_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
         port_1c1_t1_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -163,14 +130,8 @@ topology_template:
               is_required: true
             floating_ip_count_required:
               is_required: false
-        port_1c1_t2_port_name:
-        - 1c1_t2_port_1
-        - 1c1_t2_port_0
         vm_image_name:
           get_input: pd_image_name
-        compute_1c1_scalling_instance_scheduler_hints:
-        - group: BE_Affinity_group
-        - group: BE_Affinity_group
         compute_1c1_scalling_instance_name:
         - get_input:
           - 1c1_scalling_instance_names
@@ -196,6 +157,45 @@ topology_template:
         port_1c1_t2_port_network:
         - get_input: ppds_net_name
         - get_input: ppds_net_name
+        port_1c1_t1_port_fixed_ips:
+        - - ip_address:
+              get_input:
+              - myIPs
+              - 3
+        - - ip_address:
+              get_input:
+              - myIPs
+              - 1
+        port_1c1_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: true
+            floating_ip_count_required:
+              is_required: false
+        - - ip_version: 4
+            ip_count_required:
+              is_required: true
+            floating_ip_count_required:
+              is_required: false
+        port_1c1_t1_port_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        - mac_count_required:
+            is_required: false
+        port_1c1_t2_port_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        - mac_count_required:
+            is_required: false
+        compute_1c1_scalling_instance_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        port_1c1_t2_port_name:
+        - 1c1_t2_port_1
+        - 1c1_t2_port_0
+        compute_1c1_scalling_instance_scheduler_hints:
+        - group: BE_Affinity_group
+        - group: BE_Affinity_group
         service_template_filter:
           substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
           count: 2
@@ -217,6 +217,18 @@ topology_template:
         port_1b_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
+        compute_b_single_1b_availability_zone:
+        - get_input: availabilityzone_name
+        compute_b_single_1b_scheduler_hints:
+        - group: BE_Affinity_group
+        port_1b_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_1b_t1_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -225,25 +237,13 @@ topology_template:
               is_required: false
         vm_image_name:
           get_input: pd_image_name
-        compute_b_single_1b_availability_zone:
-        - get_input: availabilityzone_name
-        compute_b_single_1b_scheduler_hints:
-        - group: BE_Affinity_group
         port_1b_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network
-        port_1b_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_b_single_1b_user_data_format:
         - RAW
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_b_single_1b_name:
         - get_input:
           - b_single_1b_names
@@ -271,32 +271,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_1c2_catalog_instance_availability_zone:
+        - get_input: availabilityzone_name
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
         port_1c2_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
-        compute_1c2_catalog_instance_availability_zone:
-        - get_input: availabilityzone_name
         compute_1c2_catalog_instance_name:
         - get_input:
           - 1c2_catalog_instance_names
           - 1
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
         port_1c2_t1_port_network_role_tag:
@@ -327,32 +327,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_1c2_catalog_instance_availability_zone:
+        - get_input: availabilityzone_name
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
         port_1c2_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
-        compute_1c2_catalog_instance_availability_zone:
-        - get_input: availabilityzone_name
         compute_1c2_catalog_instance_name:
         - get_input:
           - 1c2_catalog_instance_names
           - 2
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - get_attribute:
           - abstract_1c2_catalog_instance_0
@@ -509,10 +509,6 @@ topology_template:
       directives:
       - substitutable
       properties:
-        compute_a_single_1a_availability_zone:
-        - get_input: availabilityzone_name
-        compute_a_single_1a_scheduler_hints:
-        - group: BE_Affinity_group
         port_1a_t1_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -538,6 +534,10 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
+        compute_a_single_1a_availability_zone:
+        - get_input: availabilityzone_name
+        compute_a_single_1a_scheduler_hints:
+        - group: BE_Affinity_group
         compute_a_single_1a_user_data_format:
         - RAW
         compute_a_single_1a_name:
@@ -693,6 +693,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1b_t1_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        compute_b_single_1b_user_data_format:
+        - RAW
         port_1b_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -706,25 +718,13 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1b_t1_port_network_role_tag:
         - oam
-        port_1b_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        vm_image_name:
-          get_input: pd_image_name
         port_1b_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network
-        compute_b_single_1b_user_data_format:
-        - RAW
         port_1b_t1_port_network:
         - get_input: oam_net_name
         compute_b_single_1b_name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index 2c43ee2c01..3a93e4c8b9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -11,7 +11,12 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_1c1_t1_port_fixed_ips:
+    port_1c1_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -21,21 +26,67 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1c1_t2_port_ip_requirements:
+    port_1c1_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c1_t1_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1c1_t1_port_mac_requirements:
+    vm_image_name:
+      type: string
+      required: true
+    compute_1c1_scalling_instance_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t2_port_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1c1_t2_port_network_role_tag:
+    port_1c1_t2_port_network:
       type: list
       required: true
       entry_schema:
         type: string
+    port_1c1_t1_port_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t1_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -43,74 +94,102 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_1c1_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     port_1c1_t2_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
-      required: true
     compute_1c1_scalling_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_ip_requirements:
+    port_1c1_t2_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_1c1_t2_port_name:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
     compute_1c1_scalling_instance_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_1c1_scalling_instance_name:
+    port_1c1_t2_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1c1_t1_port_name:
+        type: json
+    port_1c1_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_network:
+    port_1c1_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t2_port_fixed_ips:
+    port_1c1_t1_port_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1c1_t2_port_network:
+        type: string
+    port_1c1_t1_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: integer
   node_templates:
     1c1_scalling_instance_1c1_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c1_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c1_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c1_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c1_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c1_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c1_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c1_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c1_t1_port_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_1c1_t1_port_fixed_ips
@@ -154,6 +233,14 @@ topology_template:
     1c1_scalling_instance_1c1_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c1_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c1_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c1_t2_port_ip_requirements
@@ -166,6 +253,18 @@ topology_template:
           get_input:
           - port_1c1_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c1_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c1_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c1_t2_port_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_1c1_t2_port_fixed_ips
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index dd75d5837c..80b876b5ce 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -11,11 +11,72 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c2_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_1c2_catalog_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c2_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1c2_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c2_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1c2_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1c2_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -28,19 +89,16 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_1c2_catalog_instance_availability_zone:
+    compute_1c2_catalog_instance_name:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c2_catalog_instance_name:
+    port_1c2_t1_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
+        type: json
     port_1c2_t1_port_network:
       type: list
       required: true
@@ -51,10 +109,7 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
-    port_1c2_t2_port_ip_requirements:
+    port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -106,14 +161,38 @@ topology_template:
     1c2_catalog_instance_1c2_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c2_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c2_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t2_port_network
@@ -126,6 +205,14 @@ topology_template:
     1c2_catalog_instance_1c2_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t1_port_ip_requirements
@@ -138,6 +225,18 @@ topology_template:
           get_input:
           - port_1c2_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t1_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 213939c88e..ab88e26fa7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -11,11 +11,72 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c2_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_1c2_catalog_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c2_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1c2_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c2_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1c2_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1c2_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -28,19 +89,16 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_1c2_catalog_instance_availability_zone:
+    compute_1c2_catalog_instance_name:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c2_catalog_instance_name:
+    port_1c2_t1_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
+        type: json
     port_1c2_t1_port_network:
       type: list
       required: true
@@ -51,10 +109,7 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
-    port_1c2_t2_port_ip_requirements:
+    port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -106,14 +161,38 @@ topology_template:
     1c2_catalog_instance_1c2_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c2_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c2_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t2_port_network
@@ -126,6 +205,14 @@ topology_template:
     1c2_catalog_instance_1c2_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t1_port_ip_requirements
@@ -138,6 +225,18 @@ topology_template:
           get_input:
           - port_1c2_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t1_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
index dcfab01851..33152e6824 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
@@ -11,6 +11,62 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1a_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1a_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t2_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t1_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_image_name:
+      type: string
+      required: true
+    port_1a_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_a_single_1a_availability_zone:
       type: list
       required: true
@@ -28,42 +84,41 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_1a_t1_port_ip_requirements:
+    port_1a_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1a_t2_port_network_role_tag:
+        type: string
+    port_1a_t1_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_1a_t1_port_order:
+      type: list
       required: true
-    port_1a_t2_port_network:
+      entry_schema:
+        type: integer
+    port_1a_t2_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1a_t1_port_mac_requirements:
+        type: json
+    port_1a_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1a_t1_port_network:
+    port_1a_t2_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
-    port_1a_t2_port_ip_requirements:
+    port_1a_t2_port_order:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: integer
     compute_a_single_1a_user_data_format:
       type: list
       required: true
@@ -83,14 +138,38 @@ topology_template:
     a_single_1a_1a_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1a_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1a_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1a_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1a_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1a_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1a_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1a_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1a_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1a_t1_port_network
@@ -126,6 +205,14 @@ topology_template:
     a_single_1a_1a_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1a_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1a_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1a_t2_port_ip_requirements
@@ -138,6 +225,18 @@ topology_template:
           get_input:
           - port_1a_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1a_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1a_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1a_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1a_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml
index cefe2d2db0..cbfebea739 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -16,14 +16,6 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t1_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
-    vm_image_name:
-      type: string
-      required: true
     compute_b_single_1b_availability_zone:
       type: list
       required: true
@@ -41,6 +33,52 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_1b_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t2_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t1_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1b_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1b_t1_port_mac_requirements:
       type: list
       required: true
@@ -51,7 +89,17 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1b_t2_port_ip_requirements:
+    port_1b_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -61,14 +109,26 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_1b_t2_port_exCP_naming:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_b_single_1b_name:
       type: list
       required: true
       entry_schema:
         type: string
+    port_1b_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     b_single_1b:
       type: org.openecomp.resource.vfc.nodes.heat.b_single_1b
@@ -96,14 +156,38 @@ topology_template:
     b_single_1b_1b_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t1_port_subnetpoolid
+          - index_value
         network:
           get_attribute:
           - b_single_1b
@@ -116,14 +200,38 @@ topology_template:
     b_single_1b_1b_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 158df6fc9f..23f23830ac 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -11,6 +11,62 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1b_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1b_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_b_single_1b_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1b_t2_port_mac_requirements:
       type: list
       required: true
@@ -33,27 +89,26 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t2_port_ip_requirements:
+    port_1b_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
+    port_1b_t2_port_ip_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     port_1b_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1b_t1_port_ip_requirements:
+    port_1b_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
-    vm_image_name:
-      type: string
-      required: true
+        type: string
     port_1b_t1_port_mac_requirements:
       type: list
       required: true
@@ -64,11 +119,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    compute_b_single_1b_user_data_format:
+    port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
     port_1b_t1_port_network:
       type: list
       required: true
@@ -106,6 +161,14 @@ topology_template:
     b_single_1b_1b_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t1_port_ip_requirements
@@ -118,6 +181,18 @@ topology_template:
           get_input:
           - port_1b_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t1_port_network
@@ -130,14 +205,38 @@ topology_template:
     b_single_1b_1b_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
index 10064c8155..caa366f570 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     server_group:
       hidden: false
       immutable: false
@@ -27,6 +32,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -45,12 +55,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -87,12 +117,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -105,15 +155,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -146,15 +216,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5f4738ca50..19dc9b133d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -926,6 +926,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c12_scalling_instance:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c1_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_1c12_scalling_instance_scheduler_hints:
         type: list
         required: true
@@ -944,10 +950,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
+      port_1c1_t1_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c1_t1_port_mac_requirements:
         type: list
         required: true
@@ -962,40 +970,68 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1c1_t1_port_name:
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_1c12_scalling_instance_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
+      port_1c1_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      compute_1c12_scalling_instance_availability_zone:
+      port_1c1_t1_port_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_network:
+      port_1c1_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c12_scalling_instance_user_data_format:
+      port_1c1_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_ip_requirements:
+      port_1c1_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
+      compute_1c12_scalling_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
     attributes:
       1c12_scalling_instance_1c1_t1_port_tenant_id:
         type: list
@@ -1346,16 +1382,24 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c11_scalling_instance:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c1_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c1_t1_port_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
+      port_1c1_t1_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c1_t1_port_mac_requirements:
         type: list
         required: true
@@ -1370,52 +1414,80 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1c1_t1_port_name:
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_1c11_scalling_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c11_scalling_instance_scheduler_hints:
+      compute_1c11_scalling_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_1c11_scalling_instance_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c1_t1_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_flavor_name:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      compute_1c11_scalling_instance_name:
+      port_1c1_t1_port_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_network:
+      compute_1c11_scalling_instance_scheduler_hints:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c1_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c11_scalling_instance_availability_zone:
+      port_1c1_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c11_scalling_instance_user_data_format:
+      port_1c1_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1c1_t1_port_ip_requirements:
+      port_1c1_t1_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
+      port_1c1_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
     attributes:
       1c11_scalling_instance_instance_name:
         type: list
@@ -1766,29 +1838,92 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      server_group:
-        type: string
-        required: true
-        status: SUPPORTED
-      connectivityChk:
-        type: json
+      port_pcm_port_0_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      oam_net_gw:
-        type: string
-        description: CPS network gateway
+      port_pcm_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      pcm_server_name:
+        type: string
+        description: PCRF CM server name
+        required: true
+        status: SUPPORTED
+      cps_net_mask:
+        type: string
+        description: CPS network mask
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      oam_net_name:
+        type: string
+        description: OAM network name
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      server_group:
+        type: string
+        required: true
+        status: SUPPORTED
+      connectivityChk:
+        type: json
+        required: true
+        status: SUPPORTED
+      oam_net_gw:
+        type: string
+        description: CPS network gateway
+        required: true
+        status: SUPPORTED
       security_group_name:
         type: string
         description: the name of security group
@@ -1799,6 +1934,12 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
@@ -1809,21 +1950,11 @@ node_types:
         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
@@ -1834,11 +1965,12 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      oam_net_name:
-        type: string
-        description: OAM network name
+      port_pcm_port_1_order:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -2261,22 +2393,18 @@ node_types:
   org.openecomp.resource.abstract.nodes.a_single_2a:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      compute_a_single_2a_name:
+      compute_a_single_2a_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_a_single_2a_user_data_format:
+      port_1a_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -2291,12 +2419,30 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1a_t1_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       compute_a_single_2a_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1a_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       compute_a_single_2a_availability_zone:
         type: list
         required: true
@@ -2307,24 +2453,46 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      compute_a_single_2a_metadata:
+      port_1a_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1a_t1_port_mac_requirements:
+      port_1a_t1_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1a_t1_port_network:
+          type: string
+      port_1a_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_a_single_2a_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      compute_a_single_2a_metadata:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
     attributes:
       a_single_2a_instance_name:
         type: list
@@ -2670,12 +2838,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -2690,22 +2932,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
+      compute_1c2_catalog_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c2_catalog_instance_name:
+      port_1c2_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -2718,11 +2956,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -3181,6 +3415,74 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1a_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t2_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1a_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1a_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1a_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_a_single_1a_availability_zone:
         type: list
         required: true
@@ -3201,50 +3503,48 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_1a_t1_port_ip_requirements:
+      port_1a_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1a_t2_port_network_role_tag:
+          type: string
+      port_1a_t1_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1a_t1_port_order:
+        type: list
         required: true
         status: SUPPORTED
-      port_1a_t2_port_network:
+        entry_schema:
+          type: integer
+      port_1a_t2_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1a_t1_port_mac_requirements:
+          type: json
+      port_1a_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1a_t1_port_network:
+      port_1a_t2_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1a_t2_port_ip_requirements:
+      port_1a_t2_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: integer
       compute_a_single_1a_user_data_format:
         type: list
         required: true
@@ -3691,12 +3991,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_3:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -3711,22 +4085,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
+      compute_1c2_catalog_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c2_catalog_instance_name:
+      port_1c2_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -3739,11 +4109,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -4201,6 +4567,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_b_single_1b_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t2_port_mac_requirements:
         type: list
         required: true
@@ -4227,32 +4661,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1b_t1_port_ip_requirements:
+      port_1b_t2_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
+      port_1b_t1_port_network_role_tag:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_b_single_1b_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1b_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -4265,12 +4703,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_b_single_1b_user_data_format:
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       compute_b_single_1b_name:
         type: list
         required: true
@@ -4705,12 +5143,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -4725,12 +5237,6 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       compute_1c2_catalog_instance_metadata:
         type: list
         required: true
@@ -4743,10 +5249,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_1c2_t1_port_exCP_naming:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -4759,11 +5267,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -5221,12 +5725,86 @@ node_types:
   org.openecomp.resource.abstract.nodes.1c2_catalog_instance_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1c2_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_1c2_catalog_instance_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1c2_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1c2_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1c2_t1_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1c2_t2_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1c2_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_1c2_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1c2_t2_port_network:
         type: list
         required: true
@@ -5241,22 +5819,18 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_1c2_catalog_instance_availability_zone:
+      compute_1c2_catalog_instance_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_1c2_catalog_instance_name:
+      port_1c2_t1_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: json
       port_1c2_t1_port_network:
         type: list
         required: true
@@ -5269,11 +5843,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1c2_t2_port_ip_requirements:
+      port_1c2_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -5726,6 +6296,80 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_2b_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_b_single_2b_metadata:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_b_single_2b_scheduler_hints:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       compute_b_single_2b_availability_zone:
         type: list
         required: true
@@ -5746,6 +6390,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_1b_t2_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1b_t2_port_ip_requirements:
         type: list
         required: true
@@ -5758,50 +6408,42 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
       compute_b_single_2b_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_b_single_2b_metadata:
+      port_1b_t1_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1b_t1_port_ip_requirements:
+          type: string
+      port_1b_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_b_single_2b_scheduler_hints:
+      port_1b_t2_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1b_t2_port_network:
+          type: string
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
     attributes:
       b_single_2b_instance_name:
         type: list
@@ -6225,6 +6867,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      compute_b_single_1b_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_1b_t2_port_mac_requirements:
         type: list
         required: true
@@ -6251,16 +6961,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_1b_t2_port_ip_requirements:
+      port_1b_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_flavor_name:
-        type: string
+      port_1b_t2_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_1b_t1_port_value_specs:
         type: list
         required: true
@@ -6273,16 +6985,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t1_port_ip_requirements:
+      port_1b_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
@@ -6295,12 +7003,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_b_single_1b_user_data_format:
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       port_1b_t1_port_network:
         type: list
         required: true
@@ -6741,6 +7449,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_2b_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_1b_t1_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t1_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t1_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_b_single_2b_scheduler_hints:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_1b_t2_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_1b_t2_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_1b_t2_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       compute_b_single_2b_availability_zone:
         type: list
         required: true
@@ -6761,6 +7537,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_1b_t2_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_1b_t2_port_ip_requirements:
         type: list
         required: true
@@ -6773,10 +7555,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
       port_1b_t1_port_value_specs:
         type: list
         required: true
@@ -6795,34 +7573,30 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t1_port_ip_requirements:
+      port_1b_t1_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: string
       port_1b_t1_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_b_single_2b_scheduler_hints:
+      port_1b_t2_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_1b_t2_port_network:
+          type: string
+      port_1b_t1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       port_1b_t1_port_network:
         type: list
         required: true
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 4c81d27afc..d61ea01cc8 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
@@ -284,32 +284,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_1c2_catalog_instance_availability_zone:
+        - get_input: availabilityzone_name
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
         port_1c2_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
-        compute_1c2_catalog_instance_availability_zone:
-        - get_input: availabilityzone_name
         compute_1c2_catalog_instance_name:
         - get_input:
           - 1c2_catalog_instance_names
           - 3
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - get_attribute:
           - abstract_1c2_catalog_instance_1
@@ -342,32 +342,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_1c2_catalog_instance_availability_zone:
+        - get_input: availabilityzone_name
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
         port_1c2_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
-        compute_1c2_catalog_instance_availability_zone:
-        - get_input: availabilityzone_name
         compute_1c2_catalog_instance_name:
         - get_input:
           - 1c2_catalog_instance_names
           - 2
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - get_attribute:
           - abstract_1c2_catalog_instance_0
@@ -400,13 +400,23 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_1c2_catalog_instance_availability_zone:
+        - get_input: availabilityzone_name
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
         port_1c2_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
-        compute_1c2_catalog_instance_availability_zone:
-        - get_input: availabilityzone_name
         compute_1c2_catalog_instance_metadata:
         - connectivityTo4PNested_2:
             get_attribute:
@@ -480,21 +490,11 @@ topology_template:
         - get_input:
           - 1c2_catalog_instance_names
           - 1
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
         port_1c2_t1_port_network_role_tag:
@@ -525,32 +525,32 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_1c2_catalog_instance_availability_zone:
+        - get_input: availabilityzone_name
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c2_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
         port_1c2_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1c2_t2_port_network:
         - 1c2_catalog_instance_network
-        compute_1c2_catalog_instance_availability_zone:
-        - get_input: availabilityzone_name
         compute_1c2_catalog_instance_name:
         - get_input:
           - 1c2_catalog_instance_names
           - 2
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1c2_t1_port_network:
         - get_input: oam_net_name
         port_1c2_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
         port_1c2_t1_port_network_role_tag:
@@ -708,10 +708,6 @@ topology_template:
             get_attribute:
             - abstract_1c2_catalog_instance_1
             - 1c2_catalog_instance_instance_name
-        compute_a_single_1a_availability_zone:
-        - get_input: availabilityzone_name
-        compute_a_single_1a_scheduler_hints:
-        - group: BE_Affinity_group
         port_1a_t1_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -737,6 +733,10 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
+        compute_a_single_1a_availability_zone:
+        - get_input: availabilityzone_name
+        compute_a_single_1a_scheduler_hints:
+        - group: BE_Affinity_group
         compute_a_single_1a_user_data_format:
         - RAW
         compute_a_single_1a_name:
@@ -860,6 +860,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1b_t1_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        compute_b_single_2b_scheduler_hints:
+        - group: BE_Affinity_group
         compute_b_single_2b_availability_zone:
         - get_input: availabilityzone_name
         port_1b_t2_port_mac_requirements:
@@ -875,8 +887,6 @@ topology_template:
         - get_input:
           - b_single_2b_names
           - 1
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1b_t1_port_value_specs:
         - get_attribute:
           - abstract_a_single_1a
@@ -885,19 +895,9 @@ topology_template:
         - RAW
         port_1b_t1_port_network_role_tag:
         - oam
-        port_1b_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        vm_image_name:
-          get_input: pd_image_name
         port_1b_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        compute_b_single_2b_scheduler_hints:
-        - group: BE_Affinity_group
         port_1b_t2_port_network:
         - b_single_1b_network_2
         port_1b_t1_port_network:
@@ -1025,19 +1025,11 @@ topology_template:
               get_input:
               - myIPs
               - 1
-        vm_image_name:
-          get_input: pd_image_name
         port_1c1_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         - mac_count_required:
             is_required: false
-        port_1c1_t1_port_name:
-        - 1c1_t1_port_01
-        - 1c1_t1_port_02
-        compute_1c11_scalling_instance_scheduler_hints:
-        - group: BE_Affinity_group
-        - group: BE_Affinity_group
         vm_flavor_name:
           get_input: pd_flavor_name
         compute_1c11_scalling_instance_name:
@@ -1047,9 +1039,6 @@ topology_template:
         - get_input:
           - 1c11_scalling_instance_names
           - 2
-        port_1c1_t1_port_network:
-        - 1c1_scalling_instance_network
-        - 1c1_scalling_instance_network
         compute_1c11_scalling_instance_availability_zone:
         - get_input: availabilityzone_name
         - get_input: availabilityzone_name
@@ -1067,6 +1056,17 @@ topology_template:
               is_required: true
             floating_ip_count_required:
               is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c1_t1_port_name:
+        - 1c1_t1_port_01
+        - 1c1_t1_port_02
+        compute_1c11_scalling_instance_scheduler_hints:
+        - group: BE_Affinity_group
+        - group: BE_Affinity_group
+        port_1c1_t1_port_network:
+        - 1c1_scalling_instance_network
+        - 1c1_scalling_instance_network
         service_template_filter:
           substitute_service_template: Nested_1c11_scalling_instanceServiceTemplate.yaml
           count: 2
@@ -1085,25 +1085,8 @@ topology_template:
       directives:
       - substitutable
       properties:
-        compute_b_single_2b_availability_zone:
-        - get_input: availabilityzone_name
-        port_1b_t2_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
-        port_1b_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        compute_b_single_2b_name:
-        - get_input:
-          - b_single_2b_names
-          - 0
         vm_flavor_name:
           get_input: pd_flavor_name
-        compute_b_single_2b_user_data_format:
-        - RAW
         compute_b_single_2b_metadata:
         - connectivityTo4PNested_2:
             get_attribute:
@@ -1177,11 +1160,28 @@ topology_template:
               is_required: false
         vm_image_name:
           get_input: pd_image_name
+        compute_b_single_2b_scheduler_hints:
+        - group: BE_Affinity_group
+        compute_b_single_2b_availability_zone:
+        - get_input: availabilityzone_name
+        port_1b_t2_port_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        port_1b_t2_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        compute_b_single_2b_name:
+        - get_input:
+          - b_single_2b_names
+          - 0
+        compute_b_single_2b_user_data_format:
+        - RAW
         port_1b_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        compute_b_single_2b_scheduler_hints:
-        - group: BE_Affinity_group
         port_1b_t2_port_network:
         - b_single_1b_network_2
         service_template_filter:
@@ -1231,24 +1231,13 @@ topology_template:
         - get_input:
           - 1c12_scalling_instance_names
           - 2
-        vm_image_name:
-          get_input: pd_image_name
         port_1c1_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         - mac_count_required:
             is_required: false
-        port_1c1_t1_port_name:
-        - 1c1_t1_port_11
-        - 1c1_t1_port_12
         vm_flavor_name:
           get_input: pd_flavor_name
-        compute_1c12_scalling_instance_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        port_1c1_t1_port_network:
-        - 1c1_scalling_instance_network
-        - 1c1_scalling_instance_network
         compute_1c12_scalling_instance_user_data_format:
         - RAW1
         - RAW1
@@ -1263,6 +1252,17 @@ topology_template:
               is_required: true
             floating_ip_count_required:
               is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_1c1_t1_port_name:
+        - 1c1_t1_port_11
+        - 1c1_t1_port_12
+        compute_1c12_scalling_instance_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        port_1c1_t1_port_network:
+        - 1c1_scalling_instance_network
+        - 1c1_scalling_instance_network
         service_template_filter:
           substitute_service_template: Nested_1c12_scalling_instanceServiceTemplate.yaml
           count: 2
@@ -1411,14 +1411,8 @@ topology_template:
       directives:
       - substitutable
       properties:
-        compute_a_single_2a_name:
-        - get_input:
-          - a_single_2a_names
-          - 0
         compute_a_single_2a_user_data_format:
         - RAW
-        vm_image_name:
-          get_input: pd_image_name
         port_1a_t1_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -1431,6 +1425,17 @@ topology_template:
         - get_input: availabilityzone_name
         vm_flavor_name:
           get_input: pd_flavor_name
+        port_1a_t1_port_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        port_1a_t1_port_network:
+        - a_single_1a_network
+        compute_a_single_2a_name:
+        - get_input:
+          - a_single_2a_names
+          - 0
+        vm_image_name:
+          get_input: pd_image_name
         compute_a_single_2a_metadata:
         - connectivityTo4PNested_2:
             get_attribute:
@@ -1495,11 +1500,6 @@ topology_template:
             get_attribute:
             - abstract_1c2_catalog_instance_1
             - 1c2_catalog_instance_instance_name
-        port_1a_t1_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
-        port_1a_t1_port_network:
-        - a_single_1a_network
         service_template_filter:
           substitute_service_template: Nested_a_single_2aServiceTemplate.yaml
           count: 1
@@ -1518,6 +1518,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1b_t1_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        compute_b_single_1b_user_data_format:
+        - RAW
         port_1b_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -1531,29 +1543,17 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_1b_t1_port_value_specs:
         - get_attribute:
           - abstract_a_single_1a
           - a_single_1a_1a_t1_port_tenant_id
         port_1b_t1_port_network_role_tag:
         - oam
-        port_1b_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        vm_image_name:
-          get_input: pd_image_name
         port_1b_t1_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network_1
-        compute_b_single_1b_user_data_format:
-        - RAW
         port_1b_t1_port_network:
         - get_input: oam_net_name
         compute_b_single_1b_name:
@@ -1762,6 +1762,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1b_t1_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        compute_b_single_1b_user_data_format:
+        - RAW
         port_1b_t2_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -1775,16 +1787,6 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        port_1b_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        vm_image_name:
-          get_input: pd_image_name
         compute_b_single_1b_metadata:
         - connectivityTo4PNested_2:
             get_attribute:
@@ -1855,8 +1857,6 @@ topology_template:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network_1
-        compute_b_single_1b_user_data_format:
-        - RAW
         compute_b_single_1b_name:
         - get_input:
           - b_single_1b_names
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
index 610b8d7a56..a249ecf5cc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
@@ -11,14 +11,21 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c1_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1c1_t1_port_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
+    port_1c1_t1_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     port_1c1_t1_port_mac_requirements:
       type: list
       required: true
@@ -31,44 +38,67 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_1c1_t1_port_name:
+    vm_flavor_name:
+      type: string
+      required: true
+    compute_1c11_scalling_instance_name:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c11_scalling_instance_scheduler_hints:
+    compute_1c11_scalling_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_1c11_scalling_instance_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
+    vm_image_name:
       type: string
       required: true
-    compute_1c11_scalling_instance_name:
+    port_1c1_t1_port_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_network:
+    compute_1c11_scalling_instance_scheduler_hints:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c11_scalling_instance_availability_zone:
+    port_1c1_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c11_scalling_instance_user_data_format:
+    port_1c1_t1_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_ip_requirements:
+    port_1c1_t1_port_network:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
+    port_1c1_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
   node_templates:
     1c11_scalling_instance:
       type: org.openecomp.resource.vfc.nodes.heat.1c11_scalling_instance
@@ -96,14 +126,38 @@ topology_template:
     1c11_scalling_instance_1c1_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c1_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c1_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c1_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c1_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c1_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c1_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c1_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c1_t1_port_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_1c1_t1_port_fixed_ips
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
index 09698482d3..90c0f22132 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c1_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_1c12_scalling_instance_scheduler_hints:
       type: list
       required: true
@@ -26,9 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
+    port_1c1_t1_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     port_1c1_t1_port_mac_requirements:
       type: list
       required: true
@@ -41,46 +48,93 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_1c1_t1_port_name:
+    vm_flavor_name:
+      type: string
+      required: true
+    compute_1c12_scalling_instance_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
+    port_1c1_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
       type: string
       required: true
-    compute_1c12_scalling_instance_availability_zone:
+    port_1c1_t1_port_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_network:
+    port_1c1_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c12_scalling_instance_user_data_format:
+    port_1c1_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_ip_requirements:
+    port_1c1_t1_port_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
+    compute_1c12_scalling_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
   node_templates:
     1c12_scalling_instance_1c1_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c1_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c1_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c1_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c1_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c1_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c1_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c1_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c1_t1_port_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_1c1_t1_port_fixed_ips
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index 67305b71ce..7a439484d6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -11,11 +11,72 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c2_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_1c2_catalog_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c2_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1c2_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c2_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1c2_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1c2_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -28,11 +89,6 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_1c2_catalog_instance_availability_zone:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     compute_1c2_catalog_instance_metadata:
       type: list
       required: true
@@ -43,9 +99,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_1c2_t1_port_exCP_naming:
+      type: list
       required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_network:
       type: list
       required: true
@@ -56,10 +114,7 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
-    port_1c2_t2_port_ip_requirements:
+    port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -115,14 +170,38 @@ topology_template:
     1c2_catalog_instance_1c2_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c2_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c2_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t2_port_network
@@ -135,6 +214,14 @@ topology_template:
     1c2_catalog_instance_1c2_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t1_port_ip_requirements
@@ -147,6 +234,18 @@ topology_template:
           get_input:
           - port_1c2_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t1_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 278dffc4ff..e384bc3dc4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -11,11 +11,72 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c2_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_1c2_catalog_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c2_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1c2_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c2_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1c2_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1c2_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -28,19 +89,16 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_1c2_catalog_instance_availability_zone:
+    compute_1c2_catalog_instance_name:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c2_catalog_instance_name:
+    port_1c2_t1_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
+        type: json
     port_1c2_t1_port_network:
       type: list
       required: true
@@ -51,10 +109,7 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
-    port_1c2_t2_port_ip_requirements:
+    port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -106,14 +161,38 @@ topology_template:
     1c2_catalog_instance_1c2_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c2_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c2_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t2_port_network
@@ -126,6 +205,14 @@ topology_template:
     1c2_catalog_instance_1c2_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t1_port_ip_requirements
@@ -138,6 +225,18 @@ topology_template:
           get_input:
           - port_1c2_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t1_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml
index edff50ac2e..1ff0c9b441 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml
@@ -11,11 +11,72 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c2_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_1c2_catalog_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c2_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1c2_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c2_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1c2_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1c2_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -28,19 +89,16 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_1c2_catalog_instance_availability_zone:
+    compute_1c2_catalog_instance_name:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c2_catalog_instance_name:
+    port_1c2_t1_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
+        type: json
     port_1c2_t1_port_network:
       type: list
       required: true
@@ -51,10 +109,7 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
-    port_1c2_t2_port_ip_requirements:
+    port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -106,14 +161,38 @@ topology_template:
     1c2_catalog_instance_1c2_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c2_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c2_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t2_port_network
@@ -126,6 +205,14 @@ topology_template:
     1c2_catalog_instance_1c2_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t1_port_ip_requirements
@@ -138,6 +225,18 @@ topology_template:
           get_input:
           - port_1c2_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t1_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml
index 5d93924142..ea49f9743e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml
@@ -11,11 +11,72 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c2_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_1c2_catalog_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c2_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1c2_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c2_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1c2_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c2_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1c2_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1c2_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1c2_t2_port_network:
       type: list
       required: true
@@ -28,19 +89,16 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_1c2_catalog_instance_availability_zone:
+    compute_1c2_catalog_instance_name:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c2_catalog_instance_name:
+    port_1c2_t1_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
+        type: json
     port_1c2_t1_port_network:
       type: list
       required: true
@@ -51,10 +109,7 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
-    port_1c2_t2_port_ip_requirements:
+    port_1c2_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -106,14 +161,38 @@ topology_template:
     1c2_catalog_instance_1c2_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1c2_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1c2_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t2_port_network
@@ -126,6 +205,14 @@ topology_template:
     1c2_catalog_instance_1c2_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c2_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c2_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c2_t1_port_ip_requirements
@@ -138,6 +225,18 @@ topology_template:
           get_input:
           - port_1c2_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c2_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c2_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c2_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1c2_t1_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
index 409bf1d35f..c0ea9ef793 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
@@ -16,6 +16,62 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_1a_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1a_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t2_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t1_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_image_name:
+      type: string
+      required: true
+    port_1a_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1a_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_a_single_1a_availability_zone:
       type: list
       required: true
@@ -33,42 +89,41 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_1a_t1_port_ip_requirements:
+    port_1a_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1a_t2_port_network_role_tag:
+        type: string
+    port_1a_t1_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_1a_t1_port_order:
+      type: list
       required: true
-    port_1a_t2_port_network:
+      entry_schema:
+        type: integer
+    port_1a_t2_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1a_t1_port_mac_requirements:
+        type: json
+    port_1a_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1a_t1_port_network:
+    port_1a_t2_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
-    port_1a_t2_port_ip_requirements:
+    port_1a_t2_port_order:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: integer
     compute_a_single_1a_user_data_format:
       type: list
       required: true
@@ -88,14 +143,38 @@ topology_template:
     a_single_1a_1a_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1a_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1a_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1a_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1a_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1a_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1a_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1a_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1a_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1a_t1_port_network
@@ -135,6 +214,14 @@ topology_template:
     a_single_1a_1a_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1a_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1a_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1a_t2_port_ip_requirements
@@ -147,6 +234,18 @@ topology_template:
           get_input:
           - port_1a_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1a_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1a_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1a_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1a_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
index cfd54f1688..800932c2ed 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
@@ -11,19 +11,16 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    compute_a_single_2a_name:
+    compute_a_single_2a_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_a_single_2a_user_data_format:
+    port_1a_t1_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_image_name:
-      type: string
-      required: true
+        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -36,11 +33,26 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_1a_t1_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1a_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_a_single_2a_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1a_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     compute_a_single_2a_availability_zone:
       type: list
       required: true
@@ -49,21 +61,39 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    compute_a_single_2a_metadata:
+    port_1a_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1a_t1_port_mac_requirements:
+    port_1a_t1_port_network:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1a_t1_port_network:
+        type: string
+    port_1a_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
+    compute_a_single_2a_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_image_name:
+      type: string
+      required: true
+    port_1a_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    compute_a_single_2a_metadata:
+      type: list
+      required: true
+      entry_schema:
+        type: json
   node_templates:
     a_single_2a:
       type: org.openecomp.resource.vfc.nodes.heat.a_single_2a
@@ -95,14 +125,38 @@ topology_template:
     a_single_2a_1a_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1a_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1a_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1a_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1a_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1a_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1a_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1a_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1a_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1a_t1_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml
index b274d6c05d..d7831802db 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -11,6 +11,62 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1b_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1b_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_b_single_1b_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1b_t2_port_mac_requirements:
       type: list
       required: true
@@ -33,14 +89,16 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t2_port_ip_requirements:
+    port_1b_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
+    port_1b_t2_port_ip_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     port_1b_t1_port_value_specs:
       type: list
       required: true
@@ -51,14 +109,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1b_t1_port_ip_requirements:
+    port_1b_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
-    vm_image_name:
-      type: string
-      required: true
+        type: string
     port_1b_t1_port_mac_requirements:
       type: list
       required: true
@@ -69,11 +124,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    compute_b_single_1b_user_data_format:
+    port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
     port_1b_t1_port_network:
       type: list
       required: true
@@ -115,6 +170,14 @@ topology_template:
           get_input:
           - port_1b_t1_port_value_specs
           - index_value
+        exCP_naming:
+          get_input:
+          - port_1b_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t1_port_ip_requirements
@@ -127,6 +190,18 @@ topology_template:
           get_input:
           - port_1b_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t1_port_network
@@ -139,14 +214,38 @@ topology_template:
     b_single_1b_1b_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 36ead5cbaf..b80c2db770 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -11,6 +11,62 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1b_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_1b_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    compute_b_single_1b_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1b_t2_port_mac_requirements:
       type: list
       required: true
@@ -33,27 +89,31 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t2_port_ip_requirements:
+    port_1b_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
-      required: true
-    port_1b_t1_port_ip_requirements:
+    port_1b_t2_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
+    port_1b_t1_port_network_role_tag:
+      type: list
       required: true
+      entry_schema:
+        type: string
     compute_b_single_1b_metadata:
       type: list
       required: true
       entry_schema:
         type: json
+    port_1b_t1_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_1b_t1_port_mac_requirements:
       type: list
       required: true
@@ -64,11 +124,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    compute_b_single_1b_user_data_format:
+    port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
     compute_b_single_1b_name:
       type: list
       required: true
@@ -105,14 +165,38 @@ topology_template:
     b_single_1b_1b_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t1_port_subnetpoolid
+          - index_value
         network:
           get_attribute:
           - b_single_1b
@@ -125,14 +209,38 @@ topology_template:
     b_single_1b_1b_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml
index 8fb57944db..5ce31a4d71 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml
@@ -11,6 +11,62 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1b_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    compute_b_single_2b_scheduler_hints:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_b_single_2b_availability_zone:
       type: list
       required: true
@@ -28,6 +84,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_1b_t2_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1b_t2_port_ip_requirements:
       type: list
       required: true
@@ -38,9 +99,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
-      required: true
     port_1b_t1_port_value_specs:
       type: list
       required: true
@@ -56,29 +114,26 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1b_t1_port_ip_requirements:
+    port_1b_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
-    vm_image_name:
-      type: string
-      required: true
+        type: string
     port_1b_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_b_single_2b_scheduler_hints:
+    port_1b_t2_port_network:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1b_t2_port_network:
+        type: string
+    port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
     port_1b_t1_port_network:
       type: list
       required: true
@@ -115,6 +170,14 @@ topology_template:
           get_input:
           - port_1b_t1_port_value_specs
           - index_value
+        exCP_naming:
+          get_input:
+          - port_1b_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t1_port_ip_requirements
@@ -127,6 +190,18 @@ topology_template:
           get_input:
           - port_1b_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t1_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t1_port_network
@@ -139,14 +214,38 @@ topology_template:
     b_single_2b_1b_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
index f867345250..a8680d8869 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
@@ -11,6 +11,67 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1b_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    compute_b_single_2b_metadata:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    compute_b_single_2b_scheduler_hints:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_b_single_2b_availability_zone:
       type: list
       required: true
@@ -28,6 +89,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_1b_t2_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1b_t2_port_ip_requirements:
       type: list
       required: true
@@ -38,42 +104,36 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
-      required: true
     compute_b_single_2b_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_b_single_2b_metadata:
+    port_1b_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1b_t1_port_ip_requirements:
+        type: string
+    port_1b_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
-    vm_image_name:
-      type: string
-      required: true
+        type: string
     port_1b_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_b_single_2b_scheduler_hints:
+    port_1b_t2_port_network:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1b_t2_port_network:
+        type: string
+    port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
   node_templates:
     b_single_2b:
       type: org.openecomp.resource.vfc.nodes.heat.b_single_2b
@@ -105,14 +165,38 @@ topology_template:
     b_single_2b_1b_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t1_port_subnetpoolid
+          - index_value
         network:
           get_attribute:
           - b_single_2b
@@ -125,14 +209,38 @@ topology_template:
     b_single_2b_1b_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t2_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
index d6dd992034..a8e64880b2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,32 +11,90 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    server_group:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    availabilityzone_name:
+      label: availabilityzone name
       hidden: false
       immutable: false
       type: string
-    connectivityChk:
+      description: availabilityzone name
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    pcm_image_name:
+      label: image name
       hidden: false
       immutable: false
-      type: json
-    availabilityzone_name:
-      label: availabilityzone name
+      type: string
+      description: PCRF CM image name
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    pcm_server_name:
+      label: PCRF CM server name
       hidden: false
       immutable: false
       type: string
-      description: availabilityzone name
-    oam_net_gw:
-      label: CPS network gateway
+      description: PCRF CM server name
+    cps_net_mask:
+      label: CPS network mask
       hidden: false
       immutable: false
       type: string
-      description: CPS network gateway
-    pcm_image_name:
-      label: image name
+      description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    oam_net_name:
+      label: OAM network name
       hidden: false
       immutable: false
       type: string
-      description: PCRF CM image name
+      description: OAM network name
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    server_group:
+      hidden: false
+      immutable: false
+      type: string
+    connectivityChk:
+      hidden: false
+      immutable: false
+      type: json
+    oam_net_gw:
+      label: CPS network gateway
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network gateway
     security_group_name:
       label: security group name
       hidden: false
@@ -49,6 +107,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
@@ -61,24 +124,12 @@ topology_template:
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    pcm_server_name:
-      label: PCRF CM server name
-      hidden: false
-      immutable: false
-      type: string
-      description: PCRF CM server name
     cps_net_name:
       label: CPS network name
       hidden: false
       immutable: false
       type: string
       description: CPS network name
-    cps_net_mask:
-      label: CPS network mask
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network mask
     oam_net_ip:
       label: OAM network ip
       hidden: false
@@ -91,12 +142,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    oam_net_name:
-      label: OAM network name
-      hidden: false
-      immutable: false
-      type: string
-      description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -109,15 +159,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -150,15 +220,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0138bf7b61..1155109ae9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -18,6 +24,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -33,11 +45,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -68,11 +104,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
@@ -495,6 +555,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -505,6 +571,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -520,11 +592,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -555,11 +651,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 1ab6da631d..1a50030cb0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -23,6 +28,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -41,12 +51,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -83,12 +113,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -101,15 +151,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -139,15 +209,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index a5e41ea4fa..e75b827856 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -23,6 +28,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -41,12 +51,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -83,12 +113,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -101,15 +151,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -139,15 +209,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_jsaServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_jsaServiceTemplate.yaml
new file mode 100644
index 0000000000..80fe6dec9c
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_jsaServiceTemplate.yaml
@@ -0,0 +1,171 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Nested_jsa
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+node_types:
+  org.openecomp.resource.vfc.nodes.heat.jsa:
+    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+  inputs:
+    compute_jsa_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_image_name:
+      type: string
+      required: true
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+  node_templates:
+    jsa:
+      type: org.openecomp.resource.vfc.nodes.heat.jsa
+      properties:
+        image:
+          get_input: vm_image_name
+        name:
+          get_input:
+          - compute_jsa_name
+          - index_value
+  substitution_mappings:
+    node_type: org.openecomp.resource.abstract.nodes.jsa
+    capabilities:
+      instance_jsa:
+      - jsa
+      - instance
+      disk.latency_jsa:
+      - jsa
+      - disk.latency
+      disk.device.usage_jsa:
+      - jsa
+      - disk.device.usage
+      disk.iops_jsa:
+      - jsa
+      - disk.iops
+      disk.read.bytes.rate_jsa:
+      - jsa
+      - disk.read.bytes.rate
+      disk.device.allocation_jsa:
+      - jsa
+      - disk.device.allocation
+      disk.write.bytes.rate_jsa:
+      - jsa
+      - disk.write.bytes.rate
+      disk.ephemeral.size_jsa:
+      - jsa
+      - disk.ephemeral.size
+      cpu_util_jsa:
+      - jsa
+      - cpu_util
+      disk.device.write.bytes.rate_jsa:
+      - jsa
+      - disk.device.write.bytes.rate
+      disk.read.bytes_jsa:
+      - jsa
+      - disk.read.bytes
+      disk.capacity_jsa:
+      - jsa
+      - disk.capacity
+      disk.write.bytes_jsa:
+      - jsa
+      - disk.write.bytes
+      memory.usage_jsa:
+      - jsa
+      - memory.usage
+      disk.device.read.bytes.rate_jsa:
+      - jsa
+      - disk.device.read.bytes.rate
+      disk.device.capacity_jsa:
+      - jsa
+      - disk.device.capacity
+      disk.device.read.requests_jsa:
+      - jsa
+      - disk.device.read.requests
+      endpoint_jsa:
+      - jsa
+      - endpoint
+      disk.read.requests_jsa:
+      - jsa
+      - disk.read.requests
+      memory.resident_jsa:
+      - jsa
+      - memory.resident
+      disk.device.write.requests.rate_jsa:
+      - jsa
+      - disk.device.write.requests.rate
+      scalable_jsa:
+      - jsa
+      - scalable
+      feature_jsa:
+      - jsa
+      - feature
+      cpu_jsa:
+      - jsa
+      - cpu
+      disk.usage_jsa:
+      - jsa
+      - disk.usage
+      disk.write.requests_jsa:
+      - jsa
+      - disk.write.requests
+      memory_jsa:
+      - jsa
+      - memory
+      disk.device.write.bytes_jsa:
+      - jsa
+      - disk.device.write.bytes
+      disk.root.size_jsa:
+      - jsa
+      - disk.root.size
+      cpu.delta_jsa:
+      - jsa
+      - cpu.delta
+      disk.device.write.requests_jsa:
+      - jsa
+      - disk.device.write.requests
+      disk.device.read.requests.rate_jsa:
+      - jsa
+      - disk.device.read.requests.rate
+      os_jsa:
+      - jsa
+      - os
+      disk.allocation_jsa:
+      - jsa
+      - disk.allocation
+      binding_jsa:
+      - jsa
+      - binding
+      disk.device.read.bytes_jsa:
+      - jsa
+      - disk.device.read.bytes
+      host_jsa:
+      - jsa
+      - host
+      disk.device.latency_jsa:
+      - jsa
+      - disk.device.latency
+      vcpus_jsa:
+      - jsa
+      - vcpus
+      disk.device.iops_jsa:
+      - jsa
+      - disk.device.iops
+      disk.write.requests.rate_jsa:
+      - jsa
+      - disk.write.requests.rate
+    requirements:
+      local_storage_jsa:
+      - jsa
+      - local_storage
+      dependency_jsa:
+      - jsa
+      - dependency
\ 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/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 45251124c8..a0430c354b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       p1:
         type: string
         description: UID of OAM network
@@ -23,16 +29,73 @@ node_types:
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      oam_net_gw:
-        type: string
-        description: CPS network gateway
+      port_pcm_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      pcm_server_name:
+        type: string
+        description: PCRF CM server name
+        required: true
+        status: SUPPORTED
+      cps_net_mask:
+        type: string
+        description: CPS network mask
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      oam_net_name:
+        type: string
+        description: OAM network name
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      oam_net_gw:
+        type: string
+        description: CPS network gateway
+        required: true
+        status: SUPPORTED
       security_group_name:
         type: string
         description: the name of security group
@@ -43,6 +106,12 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
@@ -53,21 +122,11 @@ node_types:
         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
@@ -78,11 +137,12 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      oam_net_name:
-        type: string
-        description: OAM network name
+      port_pcm_port_1_order:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -510,11 +570,67 @@ node_types:
         description: UID of OAM network
         required: true
         status: SUPPORTED
+      port_oam_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
         status: SUPPORTED
+      port_oam_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      oam_server_name:
+        type: string
+        description: oam server name
+        required: true
+        status: SUPPORTED
+      port_oam_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_oam_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_oam_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_oam_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      oam_image_name:
+        type: string
+        description: oam image name
+        required: true
+        status: SUPPORTED
+      cps_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
       oam_net_gw:
         type: string
         description: CPS network gateway
@@ -535,29 +651,38 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      oam_server_name:
-        type: string
-        description: oam server name
+      port_oam_port_0_order:
+        type: list
         required: true
         status: SUPPORTED
-      pcm_vol:
-        type: string
-        description: CPS Cluman Cinder Volume
+        entry_schema:
+          type: integer
+      port_oam_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      oam_image_name:
-        type: string
-        description: oam image name
+        entry_schema:
+          type: json
+      port_oam_port_1_exCP_naming:
+        type: list
         required: true
         status: SUPPORTED
-      cps_net_name:
+        entry_schema:
+          type: json
+      port_oam_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      pcm_vol:
         type: string
-        description: CPS network name
+        description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      cps_net_mask:
+      cps_net_name:
         type: string
-        description: CPS network mask
+        description: CPS network name
         required: true
         status: SUPPORTED
       oam_net_ip:
@@ -575,11 +700,6 @@ node_types:
         description: UID of OAM network
         required: true
         status: SUPPORTED
-      oam_net_name:
-        type: string
-        description: OAM network name
-        required: true
-        status: SUPPORTED
     attributes:
       server_oam_id:
         type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 007006b550..2decadf3c7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -16,12 +16,66 @@ topology_template:
       immutable: false
       type: string
       description: UID of OAM network
+    port_oam_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
+    port_oam_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    oam_server_name:
+      label: oam server name
+      hidden: false
+      immutable: false
+      type: string
+      description: oam server name
+    port_oam_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_oam_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_oam_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_oam_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    oam_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      type: string
+      description: oam image name
+    cps_net_mask:
+      label: CPS network mask
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network mask
+    oam_net_name:
+      label: OAM network name
+      hidden: false
+      immutable: false
+      type: string
+      description: OAM network name
     oam_net_gw:
       label: CPS network gateway
       hidden: false
@@ -46,36 +100,38 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    oam_server_name:
-      label: oam server name
-      hidden: false
-      immutable: false
-      type: string
-      description: oam server name
+    port_oam_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_oam_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_oam_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_oam_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    oam_image_name:
-      label: image name
-      hidden: false
-      immutable: false
-      type: string
-      description: oam image name
     cps_net_name:
       label: CPS network name
       hidden: false
       immutable: false
       type: string
       description: CPS network name
-    cps_net_mask:
-      label: CPS network mask
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network mask
     oam_net_ip:
       label: OAM network ip
       hidden: false
@@ -93,12 +149,6 @@ topology_template:
       immutable: false
       type: string
       description: UID of OAM network
-    oam_net_name:
-      label: OAM network name
-      hidden: false
-      immutable: false
-      type: string
-      description: OAM network name
   node_templates:
     oam_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -111,15 +161,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: shared_security_group_id1
+        network_role:
+          get_input:
+          - port_oam_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_oam_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_oam_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_oam_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_oam_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -149,15 +219,35 @@ topology_template:
         security_groups:
         - get_input: shared_security_group_id1
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_oam_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_oam_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_oam_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_oam_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_oam_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index 458a0e54bb..b07c726b57 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     p1:
       hidden: false
       immutable: false
@@ -27,18 +32,71 @@ topology_template:
       immutable: false
       type: string
       description: availabilityzone name
-    oam_net_gw:
-      label: CPS network gateway
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    pcm_server_name:
+      label: PCRF CM server name
+      hidden: false
+      immutable: false
+      type: string
+      description: PCRF CM server name
+    cps_net_mask:
+      label: CPS network mask
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    oam_net_name:
+      label: OAM network name
+      hidden: false
+      immutable: false
+      type: string
+      description: OAM network name
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    oam_net_gw:
+      label: CPS network gateway
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network gateway
     security_group_name:
       label: security group name
       hidden: false
@@ -51,6 +109,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
@@ -63,24 +126,12 @@ topology_template:
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    pcm_server_name:
-      label: PCRF CM server name
-      hidden: false
-      immutable: false
-      type: string
-      description: PCRF CM server name
     cps_net_name:
       label: CPS network name
       hidden: false
       immutable: false
       type: string
       description: CPS network name
-    cps_net_mask:
-      label: CPS network mask
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network mask
     oam_net_ip:
       label: OAM network ip
       hidden: false
@@ -93,12 +144,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    oam_net_name:
-      label: OAM network name
-      hidden: false
-      immutable: false
-      type: string
-      description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -111,15 +161,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: p1
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -150,15 +220,35 @@ topology_template:
         security_groups:
         - get_input: p1
         - get_input: p2
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0e171ac23c..7fe923c53b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       metadata:
         type: string
         description: metadata
@@ -18,16 +24,73 @@ node_types:
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      oam_net_gw:
-        type: string
-        description: CPS network gateway
+      port_pcm_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      pcm_server_name:
+        type: string
+        description: PCRF CM server name
+        required: true
+        status: SUPPORTED
+      cps_net_mask:
+        type: string
+        description: CPS network mask
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      oam_net_name:
+        type: string
+        description: OAM network name
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      oam_net_gw:
+        type: string
+        description: CPS network gateway
+        required: true
+        status: SUPPORTED
       security_group_name:
         type: string
         description: the name of security group
@@ -38,6 +101,12 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
@@ -58,21 +127,11 @@ node_types:
         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
@@ -83,11 +142,12 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      oam_net_name:
-        type: string
-        description: OAM network name
+      port_pcm_port_1_order:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -510,6 +570,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.oam_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -520,6 +586,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
@@ -540,6 +612,30 @@ node_types:
         description: oam server name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -570,11 +666,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_oam_id:
         type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 0a5403054a..2c29cb26d5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -23,6 +28,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_flavor_name:
       label: PCRF CM flavor name
       hidden: false
@@ -47,6 +57,26 @@ topology_template:
       immutable: false
       type: string
       description: oam server name
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -83,12 +113,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     server_oam:
       type: org.openecomp.resource.vfc.nodes.heat.oam_server
@@ -113,15 +163,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -138,15 +208,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index a9df9055cd..26cd09769f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     metadata:
       label: metadata
       hidden: false
@@ -23,18 +28,71 @@ topology_template:
       immutable: false
       type: string
       description: availabilityzone name
-    oam_net_gw:
-      label: CPS network gateway
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    pcm_server_name:
+      label: PCRF CM server name
+      hidden: false
+      immutable: false
+      type: string
+      description: PCRF CM server name
+    cps_net_mask:
+      label: CPS network mask
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    oam_net_name:
+      label: OAM network name
+      hidden: false
+      immutable: false
+      type: string
+      description: OAM network name
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    oam_net_gw:
+      label: CPS network gateway
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network gateway
     security_group_name:
       label: security group name
       hidden: false
@@ -47,6 +105,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
@@ -71,24 +134,12 @@ topology_template:
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    pcm_server_name:
-      label: PCRF CM server name
-      hidden: false
-      immutable: false
-      type: string
-      description: PCRF CM server name
     cps_net_name:
       label: CPS network name
       hidden: false
       immutable: false
       type: string
       description: CPS network name
-    cps_net_mask:
-      label: CPS network mask
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network mask
     oam_net_ip:
       label: OAM network ip
       hidden: false
@@ -101,12 +152,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    oam_net_name:
-      label: OAM network name
-      hidden: false
-      immutable: false
-      type: string
-      description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -119,15 +169,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -157,15 +227,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 98d483a970..70506fc553 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       metadata:
         type: string
         description: metadata
@@ -18,16 +24,73 @@ node_types:
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      oam_net_gw:
-        type: string
-        description: CPS network gateway
+      port_pcm_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      pcm_server_name:
+        type: string
+        description: PCRF CM server name
+        required: true
+        status: SUPPORTED
+      cps_net_mask:
+        type: string
+        description: CPS network mask
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      oam_net_name:
+        type: string
+        description: OAM network name
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      oam_net_gw:
+        type: string
+        description: CPS network gateway
+        required: true
+        status: SUPPORTED
       security_group_name:
         type: string
         description: the name of security group
@@ -38,6 +101,12 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
@@ -53,21 +122,11 @@ node_types:
         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
@@ -78,11 +137,12 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      oam_net_name:
-        type: string
-        description: OAM network name
+      port_pcm_port_1_order:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -505,6 +565,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.oam_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -515,6 +581,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
@@ -535,6 +607,30 @@ node_types:
         description: oam server name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -565,11 +661,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_oam_id:
         type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 0a5403054a..2c29cb26d5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -23,6 +28,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_flavor_name:
       label: PCRF CM flavor name
       hidden: false
@@ -47,6 +57,26 @@ topology_template:
       immutable: false
       type: string
       description: oam server name
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -83,12 +113,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     server_oam:
       type: org.openecomp.resource.vfc.nodes.heat.oam_server
@@ -113,15 +163,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -138,15 +208,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index 102cd3617d..ac4560a682 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     metadata:
       label: metadata
       hidden: false
@@ -23,18 +28,71 @@ topology_template:
       immutable: false
       type: string
       description: availabilityzone name
-    oam_net_gw:
-      label: CPS network gateway
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    pcm_server_name:
+      label: PCRF CM server name
+      hidden: false
+      immutable: false
+      type: string
+      description: PCRF CM server name
+    cps_net_mask:
+      label: CPS network mask
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    oam_net_name:
+      label: OAM network name
+      hidden: false
+      immutable: false
+      type: string
+      description: OAM network name
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    oam_net_gw:
+      label: CPS network gateway
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network gateway
     security_group_name:
       label: security group name
       hidden: false
@@ -47,6 +105,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
@@ -65,24 +128,12 @@ topology_template:
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    pcm_server_name:
-      label: PCRF CM server name
-      hidden: false
-      immutable: false
-      type: string
-      description: PCRF CM server name
     cps_net_name:
       label: CPS network name
       hidden: false
       immutable: false
       type: string
       description: CPS network name
-    cps_net_mask:
-      label: CPS network mask
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network mask
     oam_net_ip:
       label: OAM network ip
       hidden: false
@@ -95,12 +146,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    oam_net_name:
-      label: OAM network name
-      hidden: false
-      immutable: false
-      type: string
-      description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -113,15 +163,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -151,15 +221,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0f6c0e9f7a..fa86dbe5ce 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -18,6 +24,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -33,11 +45,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -68,11 +104,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
index 05a21ce6d1..51429041fe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -23,6 +28,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -41,12 +51,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -83,12 +113,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -101,15 +151,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -139,15 +209,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in/MANIFEST.json
new file mode 100644
index 0000000000..609c38b28e
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in/MANIFEST.json
@@ -0,0 +1,21 @@
+{
+  "name": "vEP_JSA_Net",
+  "description": "Version 2.0 02-09-2016 (Authors: John Doe, user PROD)",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pcm_v0.4.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pcm_v0.4.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pcm_v0.1.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ 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/in/hot-nimbus-pcm_v0.4.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in/hot-nimbus-pcm_v0.4.env
new file mode 100644
index 0000000000..78cc03e2ea
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in/hot-nimbus-pcm_v0.4.env
@@ -0,0 +1,14 @@
+parameters:
+  pcm_server_names: ZRDM1PCRF01PCM001
+  pcm_image_name: rhel2
+  pcm_flavor_name: cps
+  availabilityzone_name: nova
+  cps_net_name: int_pcrf_net_0
+  cps_net_ips: 172.26.16.113
+  cps_net_mask: 255.255.255.0
+  oam_net_name: oam_protected_net_0
+  oam_net_ips: 107.239.64.121
+  oam_net_gw: 107.239.64.1
+  oam_net_mask: 255.255.255.0
+  pcm_volumes: 249cb355-8fdf-4382-9c3c-a2ebe767d45b
+  security_group_name: nimbus_security_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in/hot-nimbus-pcm_v0.4.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in/hot-nimbus-pcm_v0.4.yaml
new file mode 100644
index 0000000000..dea5d4296c
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in/hot-nimbus-pcm_v0.4.yaml
@@ -0,0 +1,103 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Cluman stack
+
+parameters:
+  pcm_server_names:
+    type: comma_delimited_list
+    label: PCRF CM server names
+    description: name of the PCRF CM instance
+  pcm_image_name:
+    type: string
+    label: PCRF CM image name
+    description: PCRF CM image name
+  pcm_flavor_name:
+    type: string
+    label: PCRF CM flavor name
+    description: flavor name of PCRF CM instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  oam_net_name:
+    type: string
+    label: OAM network name
+    description: OAM network name
+  oam_net_ips:
+    type: comma_delimited_list
+    label: OAM network ips
+    description: OAM network ips
+  oam_net_gw:
+    type: string
+    label: CPS network gateway
+    description: CPS network gateway
+  oam_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcm_volumes:
+    type: comma_delimited_list
+    label: CPS Cluman Cinder Volume
+    description: CPS Cluman Cinder Volume
+  security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  compute_image_name:
+    type: string
+  net_name:
+    type: string
+
+resources:
+  server_pcm_001:
+    type: nested-pcm_v0.1.yaml
+    properties:
+      pcm_server_name: { get_param: [pcm_server_names, 0] }
+      pcm_image_name: { get_param: pcm_image_name }
+      pcm_flavor_name: { get_param: pcm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      security_group_name: { get_param: security_group_name }
+      pcm_vol: { get_param: [pcm_volumes, 0] }
+      cps_net_name: { get_param: cps_net_name }
+      cps_net_ip: { get_param: [cps_net_ips, 0] }
+      cps_net_mask: { get_param: cps_net_mask }
+      oam_net_name: { get_param: oam_net_name }
+      oam_net_ip: { get_param: [oam_net_ips, 0] }
+      oam_net_mask: { get_param: oam_net_mask }
+      oam_net_gw: { get_param: oam_net_gw }
+
+  server_compute:
+    type: OS::Nova::Server
+    properties:
+      config_drive: {get_attr: [compute_port_0]}
+      name: { compute_name }
+      image: { get_param: compute_image_name }
+      flavor: { compute_flavor_name }
+      user_data_format: { get_attr: [server_pcm_001 , oam_net_gw] }
+      metadata: { get_attr: [server_pcm_001]}
+
+  compute_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: net_name }
+
+  packet_mirror_network:
+    type: OS::Neutron::Net
+    depends_on:
+      - server_pcm_001
+    properties:
+      name:
+        get_param: net_name
+
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in/nested-pcm_v0.1.yaml
new file mode 100644
index 0000000000..be8cb80777
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/in/nested-pcm_v0.1.yaml
@@ -0,0 +1,101 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Cluman stack
+
+parameters:
+  pcm_server_name:
+    type: string
+    label: PCRF CM server name
+    description: PCRF CM server name
+  pcm_image_name:
+    type: string
+    label: image name
+    description: PCRF CM image name
+  pcm_flavor_name:
+    type: string
+    label: PCRF CM flavor name
+    description: flavor name of PCRF CM instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  oam_net_name:
+    type: string
+    label: OAM network name
+    description: OAM network name
+  oam_net_ip:
+    type: string
+    label: OAM network ip
+    description: OAM network ip
+  oam_net_gw:
+    type: string
+    label: CPS network gateway
+    description: CPS network gateway
+  oam_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcm_vol:
+    type: string
+    label: CPS Cluman Cinder Volume
+    description: CPS Cluman Cinder Volume
+  security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+
+resources:
+  server_pcm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcm_server_name }
+      image: { get_param: pcm_image_name }
+      flavor: { get_param: pcm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcm_1port_0}
+        - port: { get_resource: pcm_2port_1}
+      block_device_mapping:
+        - device_name: vdb
+          volume_id: { get_param: pcm_vol}
+      user_data_format: RAW
+
+  pcm_1port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: cps_net_ip }
+      security_groups: [{ get_param: security_group_name }]
+
+  pcm_2port_1:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: oam_net_name }
+      fixed_ips:
+        - ip_address: { get_param: oam_net_ip }
+      security_groups: [{ get_param: security_group_name }]
+
+  #pcm_vol_attachment:
+  #  type: OS::Cinder::VolumeAttachment
+  #  properties:
+  #    volume_id: { get_param: pcm_vol }
+  #    mountpoint: /dev/vdb
+  #    instance_uuid: { get_resource: server_pcm }
+outputs:
+  server_pcm_id:
+    description: the pcm nova service id
+    value: { get_resource: server_pcm }
\ 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/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
new file mode 100644
index 0000000000..670f8d23ae
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -0,0 +1,855 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: GlobalSubstitutionTypes
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+node_types:
+  org.openecomp.resource.abstract.nodes.heat.pcm_server:
+    derived_from: org.openecomp.resource.abstract.nodes.VFC
+    properties:
+      availabilityzone_name:
+        type: string
+        description: availabilityzone name
+        required: true
+        status: SUPPORTED
+      port_pcm_2port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      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
+      port_pcm_1port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_1port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      security_group_name:
+        type: string
+        description: the name of security group
+        required: true
+        status: SUPPORTED
+      port_pcm_1port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      cps_net_ip:
+        type: string
+        description: CPS network ip
+        required: true
+        status: SUPPORTED
+      port_pcm_2port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      pcm_flavor_name:
+        type: string
+        description: flavor name of PCRF CM instance
+        required: true
+        status: SUPPORTED
+      port_pcm_2port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      pcm_vol:
+        type: string
+        description: CPS Cluman Cinder Volume
+        required: true
+        status: SUPPORTED
+      port_pcm_1port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_1port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      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
+      port_pcm_2port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_2port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+    attributes:
+      server_pcm_id:
+        type: string
+        description: the pcm nova service id
+        status: SUPPORTED
+    requirements:
+    - dependency_server_pcm:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_server_pcm:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - dependency_pcm_1port_0:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_pcm_1port_0:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_pcm_2port_1:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_pcm_2port_1:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    capabilities:
+      binding_pcm_2port_1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      cpu_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_pcm_2port_1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_pcm_2port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_pcm_2port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pcm_1port_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_pcm_2port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_pcm_2port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.iops_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.resident_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_pcm_2port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.usage_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.allocation_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_pcm_2port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_pcm_1port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.usage_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.root.size_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.ephemeral.size_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_pcm_1port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.requests_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      os_server_pcm:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets_pcm_1port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      endpoint_server_pcm:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests.rate_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_pcm_1port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes.rate_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.allocation_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.packets.rate_pcm_1port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_pcm_2port_1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_pcm:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_pcm_1port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_pcm_2port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes.rate_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_util_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_pcm_1port_0:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_pcm_2port_1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes.rate_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_pcm:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes_pcm_1port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_pcm_1port_0:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      cpu.delta_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.packets.rate_pcm_1port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_server_pcm:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      instance_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_server_pcm:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes.rate_server_pcm:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+  org.openecomp.resource.abstract.nodes.compute:
+    derived_from: org.openecomp.resource.abstract.nodes.VFC
+    properties:
+      compute_compute_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      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_compute_metadata:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      compute_compute_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_compute_config_drive:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
+    requirements:
+    - dependency_compute:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_compute:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    capabilities:
+      disk.device.usage_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      instance_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.ephemeral.size_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes.rate_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.latency_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.resident_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.iops_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.root.size_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.requests.rate_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.requests_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests.rate_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.usage_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      os_compute:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes.rate_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      vcpus_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.capacity_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_util_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes.rate_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.iops_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.requests.rate_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      endpoint_compute:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_compute:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_compute:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes.rate_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_compute:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.requests_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.allocation_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.allocation_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      cpu.delta_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_compute:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
\ 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
new file mode 100644
index 0000000000..03d069f43d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml
@@ -0,0 +1,243 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+topology_template:
+  inputs:
+    oam_net_ips:
+      label: OAM network ips
+      hidden: false
+      immutable: false
+      type: list
+      description: OAM network ips
+      default:
+      - 107.239.64.121
+      entry_schema:
+        type: string
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      type: string
+      description: availabilityzone name
+      default: nova
+    oam_net_gw:
+      label: CPS network gateway
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network gateway
+      default: 107.239.64.1
+    pcm_server_names:
+      label: PCRF CM server names
+      hidden: false
+      immutable: false
+      type: list
+      description: name of the PCRF CM instance
+      default:
+      - ZRDM1PCRF01PCM001
+      entry_schema:
+        type: string
+    pcm_image_name:
+      label: PCRF CM image name
+      hidden: false
+      immutable: false
+      type: string
+      description: PCRF CM image name
+      default: rhel2
+    cps_net_ips:
+      label: CPS network ips
+      hidden: false
+      immutable: false
+      type: list
+      description: CPS network ips
+      default:
+      - 172.26.16.113
+      entry_schema:
+        type: string
+    security_group_name:
+      label: security group name
+      hidden: false
+      immutable: false
+      type: string
+      description: the name of security group
+      default: nimbus_security_group
+    pcm_volumes:
+      label: CPS Cluman Cinder Volume
+      hidden: false
+      immutable: false
+      type: list
+      description: CPS Cluman Cinder Volume
+      default:
+      - 249cb355-8fdf-4382-9c3c-a2ebe767d45b
+      entry_schema:
+        type: string
+    compute_image_name:
+      hidden: false
+      immutable: false
+      type: string
+    pcm_flavor_name:
+      label: PCRF CM flavor name
+      hidden: false
+      immutable: false
+      type: string
+      description: flavor name of PCRF CM instance
+      default: cps
+    net_name:
+      hidden: false
+      immutable: false
+      type: string
+    cps_net_name:
+      label: CPS network name
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network name
+      default: int_pcrf_net_0
+    cps_net_mask:
+      label: CPS network mask
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network mask
+      default: 255.255.255.0
+    oam_net_mask:
+      label: CPS network mask
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network mask
+      default: 255.255.255.0
+    oam_net_name:
+      label: OAM network name
+      hidden: false
+      immutable: false
+      type: string
+      description: OAM network name
+      default: oam_protected_net_0
+  node_templates:
+    abstract_pcm_server_0:
+      type: org.openecomp.resource.abstract.nodes.heat.pcm_server
+      directives:
+      - substitutable
+      properties:
+        availabilityzone_name:
+          get_input: availabilityzone_name
+        oam_net_gw:
+          get_input: oam_net_gw
+        pcm_image_name:
+          get_input: pcm_image_name
+        security_group_name:
+          get_input: security_group_name
+        cps_net_ip:
+          get_input:
+          - cps_net_ips
+          - 0
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+        pcm_vol:
+          get_input:
+          - pcm_volumes
+          - 0
+        pcm_server_name:
+          get_input:
+          - pcm_server_names
+          - 0
+        cps_net_name:
+          get_input: cps_net_name
+        cps_net_mask:
+          get_input: cps_net_mask
+        oam_net_ip:
+          get_input:
+          - oam_net_ips
+          - 0
+        oam_net_mask:
+          get_input: oam_net_mask
+        oam_net_name:
+          get_input: oam_net_name
+    packet_mirror_network:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: net_name
+      requirements:
+      - dependency:
+          capability: tosca.capabilities.Node
+          node: abstract_pcm_server_0
+          relationship: tosca.relationships.DependsOn
+    compute_port_0:
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        mac_requirements:
+          mac_count_required:
+            is_required: false
+        network:
+          get_input: net_name
+    abstract_compute:
+      type: org.openecomp.resource.abstract.nodes.compute
+      directives:
+      - substitutable
+      properties:
+        compute_compute_user_data_format:
+        - get_attribute:
+          - abstract_pcm_server_0
+          - oam_net_gw
+        vm_image_name:
+          get_input: compute_image_name
+        compute_compute_metadata:
+        - get_attribute:
+          - abstract_pcm_server_0
+          - server_pcm_id
+        compute_compute_name:
+        - compute_name: null
+        vm_flavor_name:
+          compute_flavor_name: null
+        compute_compute_config_drive:
+        - get_attribute:
+          - compute_port_0
+          - tenant_id
+          - port_security_enabled
+          - device_id
+          - qos_policy
+          - allowed_address_pairs
+          - show
+          - device_owner
+          - network
+          - security_groups
+          - fixed_ips
+          - mac_address
+          - admin_state_up
+          - name
+          - subnets
+          - status
+        service_template_filter:
+          substitute_service_template: Nested_computeServiceTemplate.yaml
+          count: 1
+        index_value:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+  groups:
+    hot-nimbus-pcm_v0.4_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml
+        description: heat template that creates PCRF Cluman stack
+      members:
+      - packet_mirror_network
+      - compute_port_0
+      - abstract_compute
+      - abstract_pcm_server_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/nestedWithOneComputeDiffPortType/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/Nested_computeServiceTemplate.yaml
new file mode 100644
index 0000000000..22bdef3d42
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/Nested_computeServiceTemplate.yaml
@@ -0,0 +1,203 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Nested_compute
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+node_types:
+  org.openecomp.resource.vfc.nodes.heat.compute:
+    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+  inputs:
+    compute_compute_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_image_name:
+      type: string
+      required: true
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_compute_metadata:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    compute_compute_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    compute_compute_config_drive:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
+  node_templates:
+    compute:
+      type: org.openecomp.resource.vfc.nodes.heat.compute
+      properties:
+        flavor:
+          get_input: vm_flavor_name
+        metadata:
+          get_input:
+          - compute_compute_metadata
+          - index_value
+        config_drive:
+          get_input:
+          - compute_compute_config_drive
+          - index_value
+        image:
+          get_input: vm_image_name
+        name:
+          get_input:
+          - compute_compute_name
+          - index_value
+        user_data_format:
+          get_input:
+          - compute_compute_user_data_format
+          - index_value
+  substitution_mappings:
+    node_type: org.openecomp.resource.abstract.nodes.compute
+    capabilities:
+      disk.device.usage_compute:
+      - compute
+      - disk.device.usage
+      disk.write.requests_compute:
+      - compute
+      - disk.write.requests
+      instance_compute:
+      - compute
+      - instance
+      disk.ephemeral.size_compute:
+      - compute
+      - disk.ephemeral.size
+      disk.device.read.bytes.rate_compute:
+      - compute
+      - disk.device.read.bytes.rate
+      disk.latency_compute:
+      - compute
+      - disk.latency
+      memory.resident_compute:
+      - compute
+      - memory.resident
+      memory_compute:
+      - compute
+      - memory
+      disk.iops_compute:
+      - compute
+      - disk.iops
+      disk.root.size_compute:
+      - compute
+      - disk.root.size
+      disk.write.requests.rate_compute:
+      - compute
+      - disk.write.requests.rate
+      disk.read.requests_compute:
+      - compute
+      - disk.read.requests
+      disk.device.read.requests.rate_compute:
+      - compute
+      - disk.device.read.requests.rate
+      disk.read.bytes_compute:
+      - compute
+      - disk.read.bytes
+      disk.device.read.bytes_compute:
+      - compute
+      - disk.device.read.bytes
+      disk.write.bytes_compute:
+      - compute
+      - disk.write.bytes
+      disk.usage_compute:
+      - compute
+      - disk.usage
+      os_compute:
+      - compute
+      - os
+      disk.write.bytes.rate_compute:
+      - compute
+      - disk.write.bytes.rate
+      vcpus_compute:
+      - compute
+      - vcpus
+      disk.capacity_compute:
+      - compute
+      - disk.capacity
+      cpu_util_compute:
+      - compute
+      - cpu_util
+      disk.read.bytes.rate_compute:
+      - compute
+      - disk.read.bytes.rate
+      disk.device.latency_compute:
+      - compute
+      - disk.device.latency
+      disk.device.write.requests_compute:
+      - compute
+      - disk.device.write.requests
+      disk.device.iops_compute:
+      - compute
+      - disk.device.iops
+      disk.device.write.requests.rate_compute:
+      - compute
+      - disk.device.write.requests.rate
+      endpoint_compute:
+      - compute
+      - endpoint
+      memory.usage_compute:
+      - compute
+      - memory.usage
+      host_compute:
+      - compute
+      - host
+      feature_compute:
+      - compute
+      - feature
+      disk.device.write.bytes_compute:
+      - compute
+      - disk.device.write.bytes
+      cpu_compute:
+      - compute
+      - cpu
+      disk.device.write.bytes.rate_compute:
+      - compute
+      - disk.device.write.bytes.rate
+      scalable_compute:
+      - compute
+      - scalable
+      disk.device.read.requests_compute:
+      - compute
+      - disk.device.read.requests
+      disk.allocation_compute:
+      - compute
+      - disk.allocation
+      disk.device.capacity_compute:
+      - compute
+      - disk.device.capacity
+      disk.device.allocation_compute:
+      - compute
+      - disk.device.allocation
+      cpu.delta_compute:
+      - compute
+      - cpu.delta
+      binding_compute:
+      - compute
+      - binding
+    requirements:
+      local_storage_compute:
+      - compute
+      - local_storage
+      dependency_compute:
+      - compute
+      - dependency
\ 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/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
new file mode 100644
index 0000000000..ad1fe6a24e
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -0,0 +1,470 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: nested-pcm_v0.1
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+node_types:
+  org.openecomp.resource.vfc.nodes.heat.pcm_server:
+    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+  inputs:
+    availabilityzone_name:
+      label: availabilityzone name
+      hidden: false
+      immutable: false
+      type: string
+      description: availabilityzone name
+    port_pcm_2port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    oam_net_gw:
+      label: CPS network gateway
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network gateway
+    pcm_image_name:
+      label: image name
+      hidden: false
+      immutable: false
+      type: string
+      description: PCRF CM image name
+    port_pcm_1port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_1port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    security_group_name:
+      label: security group name
+      hidden: false
+      immutable: false
+      type: string
+      description: the name of security group
+    port_pcm_1port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    cps_net_ip:
+      label: CPS network ip
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network ip
+    port_pcm_2port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    pcm_flavor_name:
+      label: PCRF CM flavor name
+      hidden: false
+      immutable: false
+      type: string
+      description: flavor name of PCRF CM instance
+    port_pcm_2port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    pcm_vol:
+      label: CPS Cluman Cinder Volume
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS Cluman Cinder Volume
+    port_pcm_1port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_1port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    pcm_server_name:
+      label: PCRF CM server name
+      hidden: false
+      immutable: false
+      type: string
+      description: PCRF CM server name
+    cps_net_name:
+      label: CPS network name
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network name
+    cps_net_mask:
+      label: CPS network mask
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network mask
+    oam_net_ip:
+      label: OAM network ip
+      hidden: false
+      immutable: false
+      type: string
+      description: OAM network ip
+    oam_net_mask:
+      label: CPS network mask
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network mask
+    oam_net_name:
+      label: OAM network name
+      hidden: false
+      immutable: false
+      type: string
+      description: OAM network name
+    port_pcm_2port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_2port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+  node_templates:
+    server_pcm:
+      type: org.openecomp.resource.vfc.nodes.heat.pcm_server
+      properties:
+        flavor:
+          get_input: pcm_flavor_name
+        availability_zone:
+          get_input: availabilityzone_name
+        image:
+          get_input: pcm_image_name
+        config_drive: true
+        user_data_format: RAW
+        name:
+          get_input: pcm_server_name
+    pcm_1port_0:
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        security_groups:
+        - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_1port_0_network_role
+          - index_value
+        fixed_ips:
+        - ip_address:
+            get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_1port_0_subnetpoolid
+          - index_value
+        mac_requirements:
+          mac_count_required:
+            is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_1port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_1port_0_vlan_requirements
+          - index_value
+        network_role_tag: cps
+        network:
+          get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_1port_0_order
+          - index_value
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: server_pcm
+          relationship: tosca.relationships.network.BindsTo
+    pcm_2port_1:
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        security_groups:
+        - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_2port_1_network_role
+          - index_value
+        fixed_ips:
+        - ip_address:
+            get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_2port_1_subnetpoolid
+          - index_value
+        mac_requirements:
+          mac_count_required:
+            is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_2port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_2port_1_vlan_requirements
+          - index_value
+        network_role_tag: oam
+        network:
+          get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_2port_1_order
+          - index_value
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: server_pcm
+          relationship: tosca.relationships.network.BindsTo
+  groups:
+    nested-pcm_v0.1_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/nested-pcm_v0.1.yaml
+        description: heat template that creates PCRF Cluman stack
+      members:
+      - server_pcm
+      - pcm_1port_0
+      - pcm_2port_1
+  outputs:
+    server_pcm_id:
+      description: the pcm nova service id
+      value: server_pcm
+  substitution_mappings:
+    node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server
+    capabilities:
+      binding_pcm_2port_1:
+      - pcm_2port_1
+      - binding
+      cpu_server_pcm:
+      - server_pcm
+      - cpu
+      attachment_pcm_2port_1:
+      - pcm_2port_1
+      - attachment
+      network.outgoing.bytes.rate_pcm_2port_1:
+      - pcm_2port_1
+      - network.outgoing.bytes.rate
+      memory_server_pcm:
+      - server_pcm
+      - memory
+      disk.write.requests_server_pcm:
+      - server_pcm
+      - disk.write.requests
+      network.incoming.bytes_pcm_2port_1:
+      - pcm_2port_1
+      - network.incoming.bytes
+      feature_pcm_1port_0:
+      - pcm_1port_0
+      - feature
+      network.incoming.packets.rate_pcm_2port_1:
+      - pcm_2port_1
+      - network.incoming.packets.rate
+      network.outpoing.packets_pcm_2port_1:
+      - pcm_2port_1
+      - network.outpoing.packets
+      disk.device.iops_server_pcm:
+      - server_pcm
+      - disk.device.iops
+      memory.resident_server_pcm:
+      - server_pcm
+      - memory.resident
+      disk.device.write.requests_server_pcm:
+      - server_pcm
+      - disk.device.write.requests
+      network.outgoing.packets.rate_pcm_2port_1:
+      - pcm_2port_1
+      - network.outgoing.packets.rate
+      disk.device.usage_server_pcm:
+      - server_pcm
+      - disk.device.usage
+      disk.allocation_server_pcm:
+      - server_pcm
+      - disk.allocation
+      network.incoming.packets_pcm_2port_1:
+      - pcm_2port_1
+      - network.incoming.packets
+      network.outpoing.packets_pcm_1port_0:
+      - pcm_1port_0
+      - network.outpoing.packets
+      disk.usage_server_pcm:
+      - server_pcm
+      - disk.usage
+      disk.device.write.bytes_server_pcm:
+      - server_pcm
+      - disk.device.write.bytes
+      disk.root.size_server_pcm:
+      - server_pcm
+      - disk.root.size
+      disk.ephemeral.size_server_pcm:
+      - server_pcm
+      - disk.ephemeral.size
+      disk.device.latency_server_pcm:
+      - server_pcm
+      - disk.device.latency
+      network.incoming.bytes_pcm_1port_0:
+      - pcm_1port_0
+      - network.incoming.bytes
+      memory.usage_server_pcm:
+      - server_pcm
+      - memory.usage
+      disk.read.requests_server_pcm:
+      - server_pcm
+      - disk.read.requests
+      disk.capacity_server_pcm:
+      - server_pcm
+      - disk.capacity
+      os_server_pcm:
+      - server_pcm
+      - os
+      disk.read.bytes_server_pcm:
+      - server_pcm
+      - disk.read.bytes
+      disk.device.read.bytes_server_pcm:
+      - server_pcm
+      - disk.device.read.bytes
+      network.incoming.packets_pcm_1port_0:
+      - pcm_1port_0
+      - network.incoming.packets
+      endpoint_server_pcm:
+      - server_pcm
+      - endpoint
+      disk.device.read.requests.rate_server_pcm:
+      - server_pcm
+      - disk.device.read.requests.rate
+      vcpus_server_pcm:
+      - server_pcm
+      - vcpus
+      disk.write.bytes_server_pcm:
+      - server_pcm
+      - disk.write.bytes
+      disk.iops_server_pcm:
+      - server_pcm
+      - disk.iops
+      network.incoming.bytes.rate_pcm_1port_0:
+      - pcm_1port_0
+      - network.incoming.bytes.rate
+      disk.read.bytes.rate_server_pcm:
+      - server_pcm
+      - disk.read.bytes.rate
+      disk.device.allocation_server_pcm:
+      - server_pcm
+      - disk.device.allocation
+      network.incoming.packets.rate_pcm_1port_0:
+      - pcm_1port_0
+      - network.incoming.packets.rate
+      feature_pcm_2port_1:
+      - pcm_2port_1
+      - feature
+      scalable_server_pcm:
+      - server_pcm
+      - scalable
+      network.outgoing.bytes.rate_pcm_1port_0:
+      - pcm_1port_0
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes_pcm_2port_1:
+      - pcm_2port_1
+      - network.outgoing.bytes
+      disk.device.read.bytes.rate_server_pcm:
+      - server_pcm
+      - disk.device.read.bytes.rate
+      cpu_util_server_pcm:
+      - server_pcm
+      - cpu_util
+      attachment_pcm_1port_0:
+      - pcm_1port_0
+      - attachment
+      disk.write.requests.rate_server_pcm:
+      - server_pcm
+      - disk.write.requests.rate
+      network.incoming.bytes.rate_pcm_2port_1:
+      - pcm_2port_1
+      - network.incoming.bytes.rate
+      disk.device.write.bytes.rate_server_pcm:
+      - server_pcm
+      - disk.device.write.bytes.rate
+      host_server_pcm:
+      - server_pcm
+      - host
+      network.outgoing.bytes_pcm_1port_0:
+      - pcm_1port_0
+      - network.outgoing.bytes
+      binding_pcm_1port_0:
+      - pcm_1port_0
+      - binding
+      cpu.delta_server_pcm:
+      - server_pcm
+      - cpu.delta
+      network.outgoing.packets.rate_pcm_1port_0:
+      - pcm_1port_0
+      - network.outgoing.packets.rate
+      binding_server_pcm:
+      - server_pcm
+      - binding
+      disk.device.capacity_server_pcm:
+      - server_pcm
+      - disk.device.capacity
+      instance_server_pcm:
+      - server_pcm
+      - instance
+      disk.device.write.requests.rate_server_pcm:
+      - server_pcm
+      - disk.device.write.requests.rate
+      disk.latency_server_pcm:
+      - server_pcm
+      - disk.latency
+      disk.device.read.requests_server_pcm:
+      - server_pcm
+      - disk.device.read.requests
+      feature_server_pcm:
+      - server_pcm
+      - feature
+      disk.write.bytes.rate_server_pcm:
+      - server_pcm
+      - disk.write.bytes.rate
+    requirements:
+      dependency_pcm_2port_1:
+      - pcm_2port_1
+      - dependency
+      local_storage_server_pcm:
+      - server_pcm
+      - local_storage
+      link_pcm_1port_0:
+      - pcm_1port_0
+      - link
+      dependency_pcm_1port_0:
+      - pcm_1port_0
+      - dependency
+      dependency_server_pcm:
+      - server_pcm
+      - dependency
+      link_pcm_2port_1:
+      - pcm_2port_1
+      - link
\ 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/nestedWithTwoDiffComputeTypes/in/hot-nimbus-pcm_v0.4.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/in/hot-nimbus-pcm_v0.4.yaml
index c1597faeff..0b1c25ee74 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/in/hot-nimbus-pcm_v0.4.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/in/hot-nimbus-pcm_v0.4.yaml
@@ -73,7 +73,7 @@ parameters:
     type: string
 
 resources:
-  server_pcm:
+  server_pcm_1:
     type: nested-pcm_v0.1.yaml
     properties:
       pcm_server_name: { get_param: [pcm_server_names, 0] }
@@ -90,7 +90,7 @@ resources:
       oam_net_mask: { get_param: oam_net_mask }
       oam_net_gw: { get_param: oam_net_gw }
 
-  server_pd:
+  server_pd_1:
     type: nested-pcm_v0.1.yaml
     properties:
       pcm_server_name: { get_param: [pd_server_names, 1] }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/in/nested-pcm_v0.1.yaml
index 443a6886dc..5844fd6f02 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/in/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/in/nested-pcm_v0.1.yaml
@@ -69,7 +69,7 @@ parameters:
     description: the name of security group
 
 resources:
-  server_pcm:
+  server_pcm_0:
     type: OS::Nova::Server
     properties:
       config_drive: "True"
@@ -84,7 +84,7 @@ resources:
           volume_id: { get_param: pcm_vol}
       user_data_format: RAW
 
-  server_pd:
+  server_pd_0:
     type: OS::Nova::Server
     properties:
       config_drive: "True"
@@ -117,8 +117,8 @@ resources:
 outputs:
   server_pcm_id_1:
     description: the pcm nova service id
-    value: { get_resource: server_pcm }
+    value: { get_resource: server_pcm_0 }
 
   server_pcm_id_2:
     description: the pcm nova service id
-    value: { get_resource: server_pd }
\ No newline at end of file
+    value: { get_resource: server_pd_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/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 227c1af00a..ab2625118b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -98,41 +98,41 @@ node_types:
         description: the pcm nova service id
         status: SUPPORTED
     requirements:
-    - dependency_server_pcm:
+    - dependency_pcm_port_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pcm:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
+    - link_pcm_port_1:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
         occurrences:
-        - 0
-        - UNBOUNDED
-    - dependency_pcm_port_1:
+        - 1
+        - 1
+    - dependency_server_pcm_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
-        capability: tosca.capabilities.network.Linkable
-        relationship: tosca.relationships.network.LinksTo
+    - local_storage_server_pcm_0:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
         occurrences:
-        - 1
-        - 1
-    - dependency_server_pd:
+        - 0
+        - UNBOUNDED
+    - dependency_server_pd_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_pd:
+    - local_storage_server_pd_0:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -159,13 +159,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pd:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes.rate_server_pd:
+      disk.iops_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -177,12 +171,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outpoing.packets_pcm_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -195,61 +183,37 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pd:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.iops_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.allocation_server_pd:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.allocation_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      memory.usage_server_pd:
+      disk.write.bytes.rate_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_pd:
+      cpu.delta_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_pd_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_pcm:
+      disk.capacity_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_pd:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_pd_0:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pcm:
+      memory_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -261,13 +225,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pd:
+      network.incoming.bytes_pcm_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_1:
+      disk.usage_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -280,12 +244,6 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      memory.usage_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       binding_pcm_port_1:
         type: tosca.capabilities.network.Bindable
         valid_source_types:
@@ -293,18 +251,29 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      disk.read.requests_server_pcm:
+      vcpus_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pcm:
+      memory.resident_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      disk.write.requests_server_pd_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_server_pcm_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -322,19 +291,13 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.device.read.bytes_server_pcm:
+      disk.ephemeral.size_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_pd:
+      network.outgoing.bytes_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -351,6 +314,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      cpu_server_pcm_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       attachment_pcm_port_0:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -361,320 +330,345 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_pd:
+      disk.write.bytes_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pcm:
+      disk.read.requests_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_pcm:
+      disk.device.usage_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pcm:
+      disk.device.read.bytes_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pd:
+      endpoint_server_pcm_0:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_server_pcm_0:
         type: tosca.capabilities.Container
         valid_source_types:
         - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_server_pcm:
+      disk.write.requests.rate_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_pd:
+      disk.device.capacity_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_pcm:
+      disk.root.size_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pd:
+      disk.latency_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pd:
+      disk.device.iops_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_pcm:
-        type: tosca.capabilities.Scalable
+      disk.write.requests.rate_server_pcm_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pcm:
+      memory_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pd:
+      disk.device.read.bytes.rate_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_pcm:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      instance_server_pcm_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_pcm:
+      disk.device.allocation_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_pcm:
-        type: tosca.capabilities.network.Bindable
+      disk.usage_server_pd_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_server_pcm_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pcm:
+      disk.device.read.requests.rate_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_pd:
+      binding_server_pcm_0:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pcm:
+      disk.read.bytes.rate_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_pcm:
+      disk.write.bytes.rate_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_pcm:
+      cpu_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pcm:
-        type: tosca.capabilities.Node
+      disk.root.size_server_pcm_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_pd:
+      vcpus_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_pd:
+      disk.iops_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pcm:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_server_pd_0:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pd:
+      disk.device.write.bytes.rate_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pcm:
+      disk.device.capacity_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pd:
+      disk.device.write.bytes.rate_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_pcm:
+      disk.write.requests_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_server_pd:
+      disk.read.bytes_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_pcm:
+      disk.device.latency_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_pcm:
+      cpu_util_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_pd:
+      disk.device.read.requests.rate_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pcm:
+      disk.device.write.bytes_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pd:
+      disk.allocation_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pd:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_server_pcm_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_pd:
+      instance_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_pd:
+      disk.allocation_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_pcm:
+      disk.device.read.bytes_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_pcm:
+      cpu_util_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_pd:
+      disk.read.bytes.rate_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_pcm:
+      disk.device.iops_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_pcm:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.write.bytes_server_pd_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_pcm:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.capacity_server_pd_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pd:
+      disk.device.read.bytes.rate_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_pcm:
+      cpu.delta_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_pd:
+      memory.resident_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_pd:
+      disk.ephemeral.size_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pd:
+      disk.read.requests_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_pcm:
+      disk.device.write.requests.rate_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_pcm:
+      disk.device.write.requests_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_pcm:
+      binding_server_pd_0:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_server_pcm_0:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.allocation_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_pd:
+      disk.read.bytes_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_pd:
+      disk.device.read.requests_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -692,70 +686,71 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_pd:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.latency_server_pcm_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_pd:
+      disk.device.usage_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      disk.latency_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_pcm_port_1:
+      network.outgoing.bytes.rate_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_pd:
-        type: tosca.capabilities.Scalable
+      memory.usage_server_pd_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_pcm:
+      network.incoming.packets_pcm_port_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_pd:
+      disk.device.write.requests_server_pcm_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_pd:
+      disk.device.write.requests.rate_server_pd_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_server_pd:
-        type: tosca.capabilities.Node
+      disk.device.read.requests_server_pcm_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_pd_0:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_pd:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_server_pcm_0:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_pd:
+      network.incoming.bytes.rate_pcm_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -766,4 +761,9 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
+        - UNBOUNDED
+      os_server_pd_0:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
         - UNBOUNDED
\ 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/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml
index e51dba5a7c..1dc9eebe59 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml
@@ -144,7 +144,7 @@ topology_template:
       description: OAM network name
       default: oam_protected_net_0
   node_templates:
-    server_pcm:
+    server_pd_1:
       type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
       directives:
       - substitutable
@@ -154,7 +154,7 @@ topology_template:
         oam_net_gw:
           get_input: oam_net_gw
         pcm_image_name:
-          get_input: pcm_image_name
+          get_input: pd_image_name
         security_group_name:
           get_input: security_group_name
         cps_net_ip:
@@ -162,7 +162,7 @@ topology_template:
           - cps_net_ips
           - 0
         pcm_flavor_name:
-          get_input: pcm_flavor_name
+          get_input: pd_flavor_name
         service_template_filter:
           substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
         pcm_vol:
@@ -171,8 +171,8 @@ topology_template:
           - 0
         pcm_server_name:
           get_input:
-          - pcm_server_names
-          - 0
+          - pd_server_names
+          - 1
         cps_net_name:
           get_input: cps_net_name
         cps_net_mask:
@@ -185,21 +185,7 @@ topology_template:
           get_input: oam_net_mask
         oam_net_name:
           get_input: oam_net_name
-    compute_port_0:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        mac_requirements:
-          mac_count_required:
-            is_required: false
-        network:
-          get_input: net_name
-    server_pd:
+    server_pcm_1:
       type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
       directives:
       - substitutable
@@ -209,7 +195,7 @@ topology_template:
         oam_net_gw:
           get_input: oam_net_gw
         pcm_image_name:
-          get_input: pd_image_name
+          get_input: pcm_image_name
         security_group_name:
           get_input: security_group_name
         cps_net_ip:
@@ -217,7 +203,7 @@ topology_template:
           - cps_net_ips
           - 0
         pcm_flavor_name:
-          get_input: pd_flavor_name
+          get_input: pcm_flavor_name
         service_template_filter:
           substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
         pcm_vol:
@@ -226,8 +212,8 @@ topology_template:
           - 0
         pcm_server_name:
           get_input:
-          - pd_server_names
-          - 1
+          - pcm_server_names
+          - 0
         cps_net_name:
           get_input: cps_net_name
         cps_net_mask:
@@ -240,6 +226,20 @@ topology_template:
           get_input: oam_net_mask
         oam_net_name:
           get_input: oam_net_name
+    compute_port_0:
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        mac_requirements:
+          mac_count_required:
+            is_required: false
+        network:
+          get_input: net_name
   groups:
     hot-nimbus-pcm_v0.4_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -247,6 +247,6 @@ topology_template:
         heat_file: ../Artifacts/hot-nimbus-pcm_v0.4.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - server_pcm
-      - compute_port_0
-      - server_pd
\ No newline at end of file
+      - server_pd_1
+      - server_pcm_1
+      - 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/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml
index dce37eb21a..65088158c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -110,19 +110,6 @@ topology_template:
       type: string
       description: OAM network name
   node_templates:
-    server_pcm:
-      type: org.openecomp.resource.vfc.nodes.heat.pcm_server
-      properties:
-        flavor:
-          get_input: pcm_flavor_name
-        availability_zone:
-          get_input: availabilityzone_name
-        image:
-          get_input: pcm_image_name
-        config_drive: true
-        user_data_format: RAW
-        name:
-          get_input: pcm_server_name
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -146,9 +133,22 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pd
+          node: server_pd_0
           relationship: tosca.relationships.network.BindsTo
-    server_pd:
+    server_pcm_0:
+      type: org.openecomp.resource.vfc.nodes.heat.pcm_server
+      properties:
+        flavor:
+          get_input: pcm_flavor_name
+        availability_zone:
+          get_input: availabilityzone_name
+        image:
+          get_input: pcm_image_name
+        config_drive: true
+        user_data_format: RAW
+        name:
+          get_input: pcm_server_name
+    server_pd_0:
       type: org.openecomp.resource.vfc.nodes.heat.pd_server
       properties:
         flavor:
@@ -184,7 +184,7 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_pcm
+          node: server_pcm_0
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested-pcm_v0.1_group:
@@ -193,95 +193,80 @@ topology_template:
         heat_file: ../Artifacts/nested-pcm_v0.1.yaml
         description: heat template that creates PCRF Cluman stack
       members:
-      - server_pcm
       - pcm_port_1
-      - server_pd
+      - server_pcm_0
+      - server_pd_0
       - pcm_port_0
   outputs:
     server_pcm_id_2:
       description: the pcm nova service id
-      value: server_pd
+      value: server_pd_0
     server_pcm_id_1:
       description: the pcm nova service id
-      value: server_pcm
+      value: server_pcm_0
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
     capabilities:
       network.incoming.packets.rate_pcm_port_0:
       - pcm_port_0
       - network.incoming.packets.rate
-      disk.iops_server_pd:
-      - server_pd
+      disk.iops_server_pd_0:
+      - server_pd_0
       - disk.iops
-      disk.device.read.bytes.rate_server_pd:
-      - server_pd
-      - disk.device.read.bytes.rate
       network.incoming.packets.rate_pcm_port_1:
       - pcm_port_1
       - network.incoming.packets.rate
-      memory_server_pcm:
-      - server_pcm
-      - memory
       network.outpoing.packets_pcm_port_1:
       - pcm_port_1
       - network.outpoing.packets
       network.outpoing.packets_pcm_port_0:
       - pcm_port_0
       - network.outpoing.packets
-      disk.device.read.requests_server_pd:
-      - server_pd
-      - disk.device.read.requests
-      disk.device.iops_server_pcm:
-      - server_pcm
-      - disk.device.iops
-      disk.device.allocation_server_pd:
-      - server_pd
-      - disk.device.allocation
-      disk.allocation_server_pcm:
-      - server_pcm
-      - disk.allocation
-      memory.usage_server_pd:
-      - server_pd
-      - memory.usage
-      disk.read.bytes.rate_server_pd:
-      - server_pd
-      - disk.read.bytes.rate
-      disk.usage_server_pcm:
-      - server_pcm
-      - disk.usage
-      disk.root.size_server_pcm:
-      - server_pcm
-      - disk.root.size
-      memory_server_pd:
-      - server_pd
+      disk.write.bytes.rate_server_pd_0:
+      - server_pd_0
+      - disk.write.bytes.rate
+      cpu.delta_server_pd_0:
+      - server_pd_0
+      - cpu.delta
+      feature_server_pd_0:
+      - server_pd_0
+      - feature
+      disk.capacity_server_pcm_0:
+      - server_pcm_0
+      - disk.capacity
+      host_server_pd_0:
+      - server_pd_0
+      - host
+      memory_server_pd_0:
+      - server_pd_0
       - memory
-      disk.device.latency_server_pcm:
-      - server_pcm
-      - disk.device.latency
       network.incoming.bytes_pcm_port_0:
       - pcm_port_0
       - network.incoming.bytes
-      disk.device.write.requests_server_pd:
-      - server_pd
-      - disk.device.write.requests
       network.incoming.bytes_pcm_port_1:
       - pcm_port_1
       - network.incoming.bytes
+      disk.usage_server_pcm_0:
+      - server_pcm_0
+      - disk.usage
       binding_pcm_port_0:
       - pcm_port_0
       - binding
-      memory.usage_server_pcm:
-      - server_pcm
-      - memory.usage
       binding_pcm_port_1:
       - pcm_port_1
       - binding
-      disk.read.requests_server_pcm:
-      - server_pcm
-      - disk.read.requests
-      disk.read.bytes_server_pcm:
-      - server_pcm
-      - disk.read.bytes
+      vcpus_server_pcm_0:
+      - server_pcm_0
+      - vcpus
+      memory.resident_server_pcm_0:
+      - server_pcm_0
+      - memory.resident
+      disk.write.requests_server_pd_0:
+      - server_pd_0
+      - disk.write.requests
+      feature_server_pcm_0:
+      - server_pcm_0
+      - feature
       network.outgoing.packets.rate_pcm_port_0:
       - pcm_port_0
       - network.outgoing.packets.rate
@@ -291,255 +276,270 @@ topology_template:
       feature_pcm_port_1:
       - pcm_port_1
       - feature
+      disk.ephemeral.size_server_pd_0:
+      - server_pd_0
+      - disk.ephemeral.size
       network.outgoing.bytes_pcm_port_0:
       - pcm_port_0
       - network.outgoing.bytes
-      disk.device.read.bytes_server_pcm:
-      - server_pcm
-      - disk.device.read.bytes
-      disk.read.bytes_server_pd:
-      - server_pd
-      - disk.read.bytes
       feature_pcm_port_0:
       - pcm_port_0
       - feature
       network.outgoing.bytes_pcm_port_1:
       - pcm_port_1
       - network.outgoing.bytes
+      cpu_server_pcm_0:
+      - server_pcm_0
+      - cpu
       attachment_pcm_port_0:
       - pcm_port_0
       - attachment
       attachment_pcm_port_1:
       - pcm_port_1
       - attachment
-      disk.device.read.bytes_server_pd:
-      - server_pd
-      - disk.device.read.bytes
-      disk.device.read.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.read.requests.rate
-      vcpus_server_pcm:
-      - server_pcm
-      - vcpus
-      disk.write.bytes_server_pcm:
-      - server_pcm
+      disk.write.bytes_server_pd_0:
+      - server_pd_0
       - disk.write.bytes
-      host_server_pd:
-      - server_pd
+      disk.read.requests_server_pd_0:
+      - server_pd_0
+      - disk.read.requests
+      disk.device.usage_server_pd_0:
+      - server_pd_0
+      - disk.device.usage
+      disk.device.read.bytes_server_pd_0:
+      - server_pd_0
+      - disk.device.read.bytes
+      endpoint_server_pcm_0:
+      - server_pcm_0
+      - endpoint
+      host_server_pcm_0:
+      - server_pcm_0
       - host
-      disk.read.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.read.bytes.rate
-      vcpus_server_pd:
-      - server_pd
-      - vcpus
-      disk.device.allocation_server_pcm:
-      - server_pcm
-      - disk.device.allocation
-      disk.ephemeral.size_server_pd:
-      - server_pd
-      - disk.ephemeral.size
-      disk.write.requests.rate_server_pd:
-      - server_pd
+      disk.write.requests.rate_server_pd_0:
+      - server_pd_0
       - disk.write.requests.rate
-      scalable_server_pcm:
-      - server_pcm
-      - scalable
-      cpu_util_server_pcm:
-      - server_pcm
-      - cpu_util
-      disk.write.requests_server_pd:
-      - server_pd
-      - disk.write.requests
-      host_server_pcm:
-      - server_pcm
-      - host
-      cpu.delta_server_pcm:
-      - server_pcm
-      - cpu.delta
-      binding_server_pcm:
-      - server_pcm
-      - binding
-      disk.device.capacity_server_pcm:
-      - server_pcm
+      disk.device.capacity_server_pcm_0:
+      - server_pcm_0
       - disk.device.capacity
-      binding_server_pd:
-      - server_pd
-      - binding
-      disk.device.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.requests.rate
-      disk.latency_server_pcm:
-      - server_pcm
-      - disk.latency
-      disk.device.read.requests_server_pcm:
-      - server_pcm
-      - disk.device.read.requests
-      feature_server_pcm:
-      - server_pcm
-      - feature
-      disk.root.size_server_pd:
-      - server_pd
+      disk.root.size_server_pd_0:
+      - server_pd_0
       - disk.root.size
-      disk.device.read.requests.rate_server_pd:
-      - server_pd
+      disk.latency_server_pcm_0:
+      - server_pcm_0
+      - disk.latency
+      disk.device.iops_server_pd_0:
+      - server_pd_0
+      - disk.device.iops
+      disk.write.requests.rate_server_pcm_0:
+      - server_pcm_0
+      - disk.write.requests.rate
+      memory_server_pcm_0:
+      - server_pcm_0
+      - memory
+      disk.device.read.bytes.rate_server_pcm_0:
+      - server_pcm_0
+      - disk.device.read.bytes.rate
+      instance_server_pcm_0:
+      - server_pcm_0
+      - instance
+      disk.device.allocation_server_pcm_0:
+      - server_pcm_0
+      - disk.device.allocation
+      disk.usage_server_pd_0:
+      - server_pd_0
+      - disk.usage
+      disk.write.bytes_server_pcm_0:
+      - server_pcm_0
+      - disk.write.bytes
+      disk.device.read.requests.rate_server_pcm_0:
+      - server_pcm_0
       - disk.device.read.requests.rate
-      disk.write.bytes.rate_server_pcm:
-      - server_pcm
+      binding_server_pcm_0:
+      - server_pcm_0
+      - binding
+      disk.read.bytes.rate_server_pd_0:
+      - server_pd_0
+      - disk.read.bytes.rate
+      disk.write.bytes.rate_server_pcm_0:
+      - server_pcm_0
       - disk.write.bytes.rate
-      disk.device.write.bytes_server_pd:
-      - server_pd
-      - disk.device.write.bytes
-      cpu_server_pcm:
-      - server_pcm
+      cpu_server_pd_0:
+      - server_pd_0
       - cpu
-      memory.resident_server_pd:
-      - server_pd
-      - memory.resident
-      disk.write.requests_server_pcm:
-      - server_pcm
-      - disk.write.requests
-      cpu_util_server_pd:
-      - server_pd
-      - cpu_util
-      memory.resident_server_pcm:
-      - server_pcm
-      - memory.resident
-      disk.device.write.requests_server_pcm:
-      - server_pcm
-      - disk.device.write.requests
-      disk.usage_server_pd:
-      - server_pd
-      - disk.usage
-      disk.device.usage_server_pcm:
-      - server_pcm
-      - disk.device.usage
-      disk.capacity_server_pd:
-      - server_pd
-      - disk.capacity
-      endpoint_server_pd:
-      - server_pd
+      disk.root.size_server_pcm_0:
+      - server_pcm_0
+      - disk.root.size
+      vcpus_server_pd_0:
+      - server_pd_0
+      - vcpus
+      disk.iops_server_pcm_0:
+      - server_pcm_0
+      - disk.iops
+      endpoint_server_pd_0:
+      - server_pd_0
       - endpoint
-      disk.device.capacity_server_pd:
-      - server_pd
+      disk.device.write.bytes.rate_server_pd_0:
+      - server_pd_0
+      - disk.device.write.bytes.rate
+      disk.device.capacity_server_pd_0:
+      - server_pd_0
       - disk.device.capacity
-      disk.allocation_server_pd:
-      - server_pd
+      disk.device.write.bytes.rate_server_pcm_0:
+      - server_pcm_0
+      - disk.device.write.bytes.rate
+      disk.write.requests_server_pcm_0:
+      - server_pcm_0
+      - disk.write.requests
+      disk.read.bytes_server_pcm_0:
+      - server_pcm_0
+      - disk.read.bytes
+      disk.device.latency_server_pd_0:
+      - server_pd_0
+      - disk.device.latency
+      cpu_util_server_pcm_0:
+      - server_pcm_0
+      - cpu_util
+      disk.device.read.requests.rate_server_pd_0:
+      - server_pd_0
+      - disk.device.read.requests.rate
+      disk.device.write.bytes_server_pcm_0:
+      - server_pcm_0
+      - disk.device.write.bytes
+      disk.allocation_server_pcm_0:
+      - server_pcm_0
       - disk.allocation
-      disk.device.write.bytes_server_pcm:
-      - server_pcm
+      memory.usage_server_pcm_0:
+      - server_pcm_0
+      - memory.usage
+      instance_server_pd_0:
+      - server_pd_0
+      - instance
+      disk.allocation_server_pd_0:
+      - server_pd_0
+      - disk.allocation
+      disk.device.read.bytes_server_pcm_0:
+      - server_pcm_0
+      - disk.device.read.bytes
+      cpu_util_server_pd_0:
+      - server_pd_0
+      - cpu_util
+      disk.read.bytes.rate_server_pcm_0:
+      - server_pcm_0
+      - disk.read.bytes.rate
+      disk.device.iops_server_pcm_0:
+      - server_pcm_0
+      - disk.device.iops
+      disk.device.write.bytes_server_pd_0:
+      - server_pd_0
       - disk.device.write.bytes
-      disk.ephemeral.size_server_pcm:
-      - server_pcm
-      - disk.ephemeral.size
-      disk.device.usage_server_pd:
-      - server_pd
-      - disk.device.usage
-      disk.capacity_server_pcm:
-      - server_pcm
+      disk.capacity_server_pd_0:
+      - server_pd_0
       - disk.capacity
-      os_server_pcm:
-      - server_pcm
-      - os
-      endpoint_server_pcm:
-      - server_pcm
-      - endpoint
-      instance_server_pd:
-      - server_pd
-      - instance
-      disk.iops_server_pcm:
-      - server_pcm
-      - disk.iops
-      cpu.delta_server_pd:
-      - server_pd
-      - cpu.delta
-      disk.latency_server_pd:
-      - server_pd
-      - disk.latency
-      disk.device.write.bytes.rate_server_pd:
-      - server_pd
-      - disk.device.write.bytes.rate
-      disk.device.read.bytes.rate_server_pcm:
-      - server_pcm
+      disk.device.read.bytes.rate_server_pd_0:
+      - server_pd_0
       - disk.device.read.bytes.rate
-      disk.write.requests.rate_server_pcm:
-      - server_pcm
-      - disk.write.requests.rate
-      disk.device.write.bytes.rate_server_pcm:
-      - server_pcm
-      - disk.device.write.bytes.rate
-      disk.device.iops_server_pd:
-      - server_pd
-      - disk.device.iops
-      disk.read.requests_server_pd:
-      - server_pd
+      cpu.delta_server_pcm_0:
+      - server_pcm_0
+      - cpu.delta
+      memory.resident_server_pd_0:
+      - server_pd_0
+      - memory.resident
+      disk.ephemeral.size_server_pcm_0:
+      - server_pcm_0
+      - disk.ephemeral.size
+      disk.read.requests_server_pcm_0:
+      - server_pcm_0
       - disk.read.requests
+      disk.device.write.requests.rate_server_pcm_0:
+      - server_pcm_0
+      - disk.device.write.requests.rate
+      disk.device.write.requests_server_pd_0:
+      - server_pd_0
+      - disk.device.write.requests
+      binding_server_pd_0:
+      - server_pd_0
+      - binding
+      scalable_server_pcm_0:
+      - server_pcm_0
+      - scalable
+      disk.device.allocation_server_pd_0:
+      - server_pd_0
+      - disk.device.allocation
+      disk.read.bytes_server_pd_0:
+      - server_pd_0
+      - disk.read.bytes
+      disk.device.read.requests_server_pd_0:
+      - server_pd_0
+      - disk.device.read.requests
       network.outgoing.bytes.rate_pcm_port_1:
       - pcm_port_1
       - network.outgoing.bytes.rate
       network.incoming.packets_pcm_port_0:
       - pcm_port_0
       - network.incoming.packets
-      os_server_pd:
-      - server_pd
-      - os
-      disk.device.latency_server_pd:
-      - server_pd
+      disk.device.latency_server_pcm_0:
+      - server_pcm_0
       - disk.device.latency
+      disk.device.usage_server_pcm_0:
+      - server_pcm_0
+      - disk.device.usage
+      disk.latency_server_pd_0:
+      - server_pd_0
+      - disk.latency
       network.outgoing.bytes.rate_pcm_port_0:
       - pcm_port_0
       - network.outgoing.bytes.rate
+      memory.usage_server_pd_0:
+      - server_pd_0
+      - memory.usage
       network.incoming.packets_pcm_port_1:
       - pcm_port_1
       - network.incoming.packets
-      scalable_server_pd:
-      - server_pd
+      disk.device.write.requests_server_pcm_0:
+      - server_pcm_0
+      - disk.device.write.requests
+      disk.device.write.requests.rate_server_pd_0:
+      - server_pd_0
+      - disk.device.write.requests.rate
+      disk.device.read.requests_server_pcm_0:
+      - server_pcm_0
+      - disk.device.read.requests
+      scalable_server_pd_0:
+      - server_pd_0
       - scalable
-      instance_server_pcm:
-      - server_pcm
-      - instance
-      disk.write.bytes_server_pd:
-      - server_pd
-      - disk.write.bytes
-      disk.write.bytes.rate_server_pd:
-      - server_pd
-      - disk.write.bytes.rate
-      feature_server_pd:
-      - server_pd
-      - feature
+      os_server_pcm_0:
+      - server_pcm_0
+      - os
       network.incoming.bytes.rate_pcm_port_0:
       - pcm_port_0
       - network.incoming.bytes.rate
-      disk.device.write.requests.rate_server_pd:
-      - server_pd
-      - disk.device.write.requests.rate
-      cpu_server_pd:
-      - server_pd
-      - cpu
       network.incoming.bytes.rate_pcm_port_1:
       - pcm_port_1
       - network.incoming.bytes.rate
+      os_server_pd_0:
+      - server_pd_0
+      - os
     requirements:
+      dependency_server_pcm_0:
+      - server_pcm_0
+      - dependency
+      local_storage_server_pcm_0:
+      - server_pcm_0
+      - local_storage
       link_pcm_port_0:
       - pcm_port_0
       - link
       link_pcm_port_1:
       - pcm_port_1
       - link
-      local_storage_server_pd:
-      - server_pd
-      - local_storage
-      dependency_server_pd:
-      - server_pd
-      - dependency
-      local_storage_server_pcm:
-      - server_pcm
-      - local_storage
       dependency_pcm_port_0:
       - pcm_port_0
       - dependency
-      dependency_server_pcm:
-      - server_pcm
+      local_storage_server_pd_0:
+      - server_pd_0
+      - local_storage
+      dependency_server_pd_0:
+      - server_pd_0
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 18acb4f442..de3481367e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -18,6 +24,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -33,11 +45,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -68,11 +104,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
@@ -495,6 +555,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -505,6 +571,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -520,11 +592,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -555,11 +651,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
@@ -982,6 +1102,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -992,6 +1118,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -1007,11 +1139,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -1042,11 +1198,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 1ab6da631d..1a50030cb0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -23,6 +28,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -41,12 +51,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -83,12 +113,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -101,15 +151,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -139,15 +209,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index a5e41ea4fa..e75b827856 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -23,6 +28,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -41,12 +51,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -83,12 +113,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -101,15 +151,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -139,15 +209,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
index 9002b35770..4803278efc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -23,6 +28,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -41,12 +51,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -83,12 +113,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -101,15 +151,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -139,15 +209,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -377,4 +467,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
+      - dependency
\ 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/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index daaf03d55e..fe6e819385 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -18,6 +24,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -33,11 +45,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -68,11 +104,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
@@ -495,6 +555,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -505,6 +571,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -520,11 +592,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -555,11 +651,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
index 05a21ce6d1..51429041fe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -23,6 +28,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -41,12 +51,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -83,12 +113,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -101,15 +151,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -139,15 +209,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
index a788426a41..bae5cf0d08 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -23,6 +28,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -41,12 +51,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -83,12 +113,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -101,15 +151,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -139,15 +209,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 14d9ffa1f4..b9bd9b6cf8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -18,6 +24,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -33,11 +45,35 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
@@ -68,11 +104,35 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       server_pcm_id:
         type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 05a21ce6d1..51429041fe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -23,6 +28,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -41,12 +51,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
@@ -83,12 +113,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -101,15 +151,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -139,15 +209,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f3b983e920..c91ab33909 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,42 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +66,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_replacement_policy:
+      port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
index 7997fe0a81..cb58589bfe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
@@ -46,6 +46,21 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -67,21 +82,6 @@ topology_template:
         port_pd01_port_network:
         - Network-1
         - Network-0
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        port_pd01_port_replacement_policy:
-        - AUTO_PORT_1
-        - AUTO_PORT_0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW_SERVER_PD_2
         - RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
index 45fd36f894..ce1fbac923 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,36 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +59,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_replacement_policy:
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,18 +112,42 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2080edef46..e073c59ae5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,42 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +66,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_replacement_policy:
+      port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
index c87498fa1d..3f3be668d3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
@@ -60,6 +60,21 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -81,21 +96,6 @@ topology_template:
         port_pd01_port_network:
         - Network-1
         - Network-0
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        port_pd01_port_replacement_policy:
-        - AUTO_PORT_1
-        - AUTO_PORT_0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW_SERVER_PD_2
         - RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 9923db380e..34003c6f29 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,36 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +59,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_replacement_policy:
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,18 +112,42 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 84dba74e5c..71c1bf5986 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,42 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +66,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_replacement_policy:
+      port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
index b31071fa0a..a5a1489254 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
@@ -53,6 +53,23 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - get_attribute:
+          - network_policy_server
+          - name
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -74,23 +91,6 @@ topology_template:
         port_pd01_port_network:
         - Network-1
         - Network-0
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        port_pd01_port_replacement_policy:
-        - get_attribute:
-          - network_policy_server
-          - name
-        - AUTO_PORT_0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW_SERVER_PD_2
         - get_attribute:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
index c588df7d89..a4bb6fb890 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,36 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +59,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_replacement_policy:
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -91,18 +121,42 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 36bd7af7d6..18abf27241 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,30 +60,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
index bd65262adb..baffa1f9d1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
@@ -46,6 +46,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -67,18 +79,6 @@ topology_template:
         port_pd01_port_network:
         - Network-1
         - Network-0
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
index 1ebbdaa7f0..72af3bb88c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,26 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.nodes.heat.pd_server
@@ -72,18 +102,42 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_attribute:
           - pd_server
           - accessIPv4
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1acef555cb..d594580a18 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,48 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_security_groups:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,37 +72,31 @@ node_types:
         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_pd_server_availability_zone:
+      port_pd01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_name:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_replacement_policy:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role_tag:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_security_groups:
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
index ae7dd92592..8984db0da7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
@@ -67,6 +67,24 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_pd01_port_security_groups:
+        - - jsa_security_group
+        - - jsa_security_group
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -88,24 +106,6 @@ topology_template:
         port_pd01_port_network:
         - Network-1
         - Network-0
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        port_pd01_port_replacement_policy:
-        - AUTO_PORT_1
-        - AUTO_PORT_0
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        port_pd01_port_security_groups:
-        - - jsa_security_group
-        - - jsa_security_group
         compute_pd_server_user_data_format:
         - RAW_SERVER_PD_2
         - RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index a71e2c4593..9aa0aa9eb3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,41 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_pd01_port_security_groups:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,32 +64,27 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_pd_server_name:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_replacement_policy:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role_tag:
+      type: list
       required: true
-    port_pd01_port_security_groups:
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -91,18 +121,42 @@ topology_template:
           get_input:
           - port_pd01_port_security_groups
           - index_value
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f3b983e920..c91ab33909 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,42 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +66,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_replacement_policy:
+      port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
index 4ef370388a..8501ed37c2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -75,6 +75,21 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -96,21 +111,6 @@ topology_template:
         port_pd01_port_network:
         - packet_mirror_network
         - packet_mirror_network
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        port_pd01_port_replacement_policy:
-        - AUTO_PORT_1
-        - AUTO_PORT_0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW_SERVER_PD_2
         - RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 45fd36f894..ce1fbac923 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,36 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +59,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_replacement_policy:
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,18 +112,42 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 96d645f0e2..27d88f15be 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,13 +8,49 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pd01_port_mac_requirements:
+      compute_pd_server_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_pd_server_scheduler_hints:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -36,36 +72,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_replacement_policy:
+      port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
index baf0b4a3b2..d12bf29530 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
@@ -46,14 +46,29 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_scheduler_hints:
+        - group: BE_Affinity_group
+        - group: BE_Affinity_group
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
         - mac_count_required:
             is_required: false
-        compute_pd_server_scheduler_hints:
-        - group: BE_Affinity_group
-        - group: BE_Affinity_group
         vm_image_name:
           get_input: pd_image_name
         port_pd01_port_ip_requirements:
@@ -70,21 +85,6 @@ topology_template:
         port_pd01_port_network:
         - Network-1
         - Network-0
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        port_pd01_port_replacement_policy:
-        - AUTO_PORT_1
-        - AUTO_PORT_0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW_SERVER_PD_2
         - RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
index 0d1df3e26b..16c6ed13a1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,12 +11,42 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pd01_port_mac_requirements:
+    compute_pd_server_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_pd_server_scheduler_hints:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_pd01_port_mac_requirements:
       type: list
       required: true
       entry_schema:
@@ -34,31 +64,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_replacement_policy:
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -91,18 +121,42 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cf7b8e5315..8e7dc7ab42 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,42 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +66,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_replacement_policy:
+      port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
index 38f0073e5d..d1b8f72259 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -46,6 +46,21 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -67,21 +82,6 @@ topology_template:
         port_pd01_port_network:
         - Network-1
         - Network-0
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        port_pd01_port_replacement_policy:
-        - AUTO_PORT_1
-        - AUTO_PORT_0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW_SERVER_PD_2
         - RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index f49877e3d1..b358a96558 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,36 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +59,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_replacement_policy:
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,18 +112,42 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cf85c2d08a..102842abb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,42 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +66,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_replacement_policy:
+      port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -411,10 +447,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
+      port_ps01_port_subnetpoolid:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_ps_server_availability_zone:
         type: list
         required: true
@@ -435,6 +473,32 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_ps01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_ps01_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_ps01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_ps01_port_replacement_policy:
         type: list
         required: true
@@ -453,11 +517,19 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_ps01_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_ps01_port_ip_requirements:
+        entry_schema:
+          type: json
+      port_ps01_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_ps01_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
index a1c581355c..661adcc7e4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
@@ -73,6 +73,21 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO
+        - AUTO
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -94,21 +109,6 @@ topology_template:
         port_pd01_port_network:
         - Network-PD-1
         - Network-PD-0
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        port_pd01_port_replacement_policy:
-        - AUTO
-        - AUTO
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - null
         - RAW
@@ -132,14 +132,16 @@ topology_template:
         - get_input:
           - ps_server_names
           - 1
-        vm_image_name:
-          get_input: ps_image_name
         compute_ps_server_availability_zone:
         - get_input: availabilityzone_name
         - get_input: availabilityzone_name
         compute_ps_server_user_data_format:
         - null
         - RAW
+        vm_flavor_name:
+          get_input: ps_flavor_name
+        vm_image_name:
+          get_input: ps_image_name
         port_ps01_port_replacement_policy:
         - AUTO
         - AUTO
@@ -151,8 +153,6 @@ topology_template:
         port_ps01_port_network:
         - Network-PS-0
         - Network-PS-1
-        vm_flavor_name:
-          get_input: ps_flavor_name
         port_ps01_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
index 45fd36f894..ce1fbac923 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,36 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +59,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_replacement_policy:
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,18 +112,42 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
index 3de2a46d80..87e999cf79 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
@@ -16,9 +16,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
+    port_ps01_port_subnetpoolid:
+      type: list
       required: true
+      entry_schema:
+        type: string
     compute_ps_server_availability_zone:
       type: list
       required: true
@@ -36,6 +38,27 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_ps01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_ps01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    vm_image_name:
+      type: string
+      required: true
+    port_ps01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_ps01_port_replacement_policy:
       type: list
       required: true
@@ -51,14 +74,21 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
-      required: true
     port_ps01_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_ps01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_ps01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
   node_templates:
     ps_server:
       type: org.openecomp.resource.vfc.nodes.heat.ps_server
@@ -82,18 +112,42 @@ topology_template:
     ps_server_ps01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_ps01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_ps01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_ps01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_ps01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_ps01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_ps01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_ps01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_ps01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_ps01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_ps01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c814e074c2..762c7c10c4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,42 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +66,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_replacement_policy:
+      port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -417,10 +453,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
+      port_ps01_port_subnetpoolid:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_ps_server_availability_zone:
         type: list
         required: true
@@ -441,6 +479,32 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_ps01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_ps01_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_ps01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_ps01_port_replacement_policy:
         type: list
         required: true
@@ -459,11 +523,19 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_ps01_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_ps01_port_ip_requirements:
+        entry_schema:
+          type: json
+      port_ps01_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_ps01_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
index 871efb849a..2174bb769f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
@@ -73,6 +73,21 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO
+        - AUTO
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -94,21 +109,6 @@ topology_template:
         port_pd01_port_network:
         - Network-PD-1
         - Network-PD-0
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        port_pd01_port_replacement_policy:
-        - AUTO
-        - AUTO
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - null
         - get_attribute:
@@ -134,8 +134,6 @@ topology_template:
         - get_input:
           - ps_server_names
           - 1
-        vm_image_name:
-          get_input: ps_image_name
         compute_ps_server_availability_zone:
         - get_input: availabilityzone_name
         - get_input: availabilityzone_name
@@ -144,6 +142,10 @@ topology_template:
           - abstract_pd_server
           - pd_server_accessIPv4
         - null
+        vm_flavor_name:
+          get_input: ps_flavor_name
+        vm_image_name:
+          get_input: ps_image_name
         port_ps01_port_replacement_policy:
         - AUTO
         - AUTO
@@ -155,8 +157,6 @@ topology_template:
         port_ps01_port_network:
         - Network-PS-0
         - Network-PS-1
-        vm_flavor_name:
-          get_input: ps_flavor_name
         port_ps01_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
index dc5f1e5474..a03be48f50 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,36 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +59,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_replacement_policy:
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,18 +112,42 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
index be9be2ceb6..f65ddfa0ca 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
@@ -16,9 +16,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
+    port_ps01_port_subnetpoolid:
+      type: list
       required: true
+      entry_schema:
+        type: string
     compute_ps_server_availability_zone:
       type: list
       required: true
@@ -36,6 +38,27 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_ps01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_ps01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    vm_image_name:
+      type: string
+      required: true
+    port_ps01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_ps01_port_replacement_policy:
       type: list
       required: true
@@ -51,14 +74,21 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
-      required: true
     port_ps01_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_ps01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_ps01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
   node_templates:
     ps_server:
       type: org.openecomp.resource.vfc.nodes.heat.ps_server
@@ -82,18 +112,42 @@ topology_template:
     ps_server_ps01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_ps01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_ps01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_ps01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_ps01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_ps01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_ps01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_ps01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_ps01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_ps01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_ps01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 73f2c6fad8..b003fc2638 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -34,10 +34,28 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd02_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd02_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd02_port_network_role_tag:
         type: list
         required: true
@@ -50,6 +68,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd02_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       vm_image_name:
         type: string
         required: true
@@ -66,6 +90,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd02_port_ip_requirements:
         type: list
         required: true
@@ -78,6 +132,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd02_port_network:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
index e9da306669..6d0690a78d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
@@ -33,9 +33,24 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_flavor_name:
       type: string
       required: true
+    port_pd02_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd02_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd02_port_network_role_tag:
       type: list
       required: true
@@ -46,6 +61,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_image_name:
       type: string
       required: true
@@ -59,6 +79,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd02_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd02_port_ip_requirements:
       type: list
       required: true
@@ -69,6 +114,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd02_port_network:
       type: list
       required: true
@@ -102,6 +152,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -114,6 +172,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
@@ -126,6 +196,14 @@ topology_template:
     pd_server_pd02_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd02_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd02_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd02_port_ip_requirements
@@ -138,6 +216,18 @@ topology_template:
           get_input:
           - port_pd02_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd02_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd02_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd02_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd02_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 33a9362697..cad5199137 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,29 +8,25 @@ node_types:
   org.openecomp.resource.abstract.nodes.smp:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_port_ip_requirements:
+      port_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_port_mac_requirements:
+      port_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_port_network:
+          type: string
+      compute_smp_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_smp_name:
+      port_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
@@ -50,28 +46,68 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      compute_smp_metadata:
+      compute_smp_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_smp_user_data_format:
+      port_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_smp_metadata:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_port_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       compute_smp_scheduler_hints:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
index 9a471a91a9..6b57e2663d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
@@ -55,17 +55,9 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         port_port_mac_requirements:
         - mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: image_smp_name
         port_port_network:
         - get_input: port_name
         compute_smp_name:
@@ -74,14 +66,22 @@ topology_template:
         - get_input: availability_zone_0
         vm_flavor_name:
           get_input: flavor_smp_name
+        compute_smp_user_data_format:
+        - RAW
+        port_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        vm_image_name:
+          get_input: image_smp_name
         compute_smp_metadata:
         - jx_vm_role: smp2
           vnf_id:
             get_input: vnf_id
           jx_lab_name:
             get_input: lab_name
-        compute_smp_user_data_format:
-        - RAW
         port_port_replacement_policy:
         - AUTO
         compute_smp_scheduler_hints:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
index 79e0b10db2..77117043d6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
@@ -11,19 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
     port_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
     port_port_network:
       type: list
       required: true
@@ -34,6 +26,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -46,24 +43,57 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     vm_flavor_name:
       type: string
       required: true
-    compute_smp_metadata:
+    compute_smp_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_smp_user_data_format:
+    port_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
+    vm_image_name:
+      type: string
+      required: true
+    compute_smp_metadata:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_port_replacement_policy:
       type: list
       required: true
       entry_schema:
         type: string
+    port_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     compute_smp_scheduler_hints:
       type: list
       required: true
@@ -73,18 +103,42 @@ topology_template:
     smp_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b6c7aa061c..2adc34400a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,14 +8,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      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_pd_server_availability_zone:
         type: list
         required: true
@@ -34,12 +26,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_mac_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
       vm_flavor_name:
         type: string
         required: true
@@ -66,19 +52,75 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_security_groups:
+      port_pd02_port_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_pd02_port_replacement_policy:
+      port_pd02_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_ip_requirements:
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      compute_pd_server_user_data_format:
+        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_pd02_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd02_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd02_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd02_port_security_groups:
         type: list
         required: true
         status: SUPPORTED
@@ -90,25 +132,43 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_ip_requirements:
+      port_pd01_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_pd01_port_network_role_tag:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_network:
+      port_pd02_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_user_data_format:
+      port_pd02_port_network:
         type: list
         required: true
         status: SUPPORTED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
index ea3d41d97c..751466605b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
@@ -104,9 +104,6 @@ topology_template:
           - 0
         port_pd01_port_replacement_policy:
         - AUTO
-        port_pd02_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
         vm_flavor_name:
           get_input: pd_flavor_name
         port_pd01_port_security_groups:
@@ -118,8 +115,6 @@ topology_template:
             is_required: false
         vm_image_name:
           get_input: pd_image_name
-        port_pd02_port_security_groups:
-        - - jsa_security_group
         port_pd02_port_replacement_policy:
         - AUTO
         port_pd01_port_ip_requirements:
@@ -128,6 +123,13 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
+        compute_pd_server_user_data_format:
+        - RAW
+        port_pd02_port_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        port_pd02_port_security_groups:
+        - - jsa_security_group
         port_pd01_port_network:
         - get_input: oam_net_name
         port_pd02_port_ip_requirements:
@@ -140,8 +142,6 @@ topology_template:
         - oam
         port_pd02_port_network:
         - get_input: oam_net_name
-        compute_pd_server_user_data_format:
-        - RAW
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index cefeecf3ff..159644651b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,13 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -33,11 +26,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_mac_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
     vm_flavor_name:
       type: string
       required: true
@@ -59,17 +47,64 @@ topology_template:
     vm_image_name:
       type: string
       required: true
-    port_pd02_port_security_groups:
+    port_pd02_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_pd02_port_replacement_policy:
+    port_pd02_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_ip_requirements:
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    compute_pd_server_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd02_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd02_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd02_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd02_port_security_groups:
       type: list
       required: true
       entry_schema:
@@ -79,22 +114,37 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_ip_requirements:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd02_port_exCP_naming:
       type: list
       required: true
       entry_schema:
         type: json
-    port_pd01_port_network_role_tag:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd02_port_network:
+    port_pd02_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_user_data_format:
+    port_pd02_port_network:
       type: list
       required: true
       entry_schema:
@@ -126,10 +176,18 @@ topology_template:
           get_input:
           - port_pd01_port_security_groups
           - index_value
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -142,6 +200,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
@@ -158,10 +228,18 @@ topology_template:
           get_input:
           - port_pd02_port_security_groups
           - index_value
+        exCP_naming:
+          get_input:
+          - port_pd02_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd02_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd02_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd02_port_ip_requirements
@@ -174,6 +252,18 @@ topology_template:
           get_input:
           - port_pd02_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd02_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd02_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd02_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd02_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c2a86696e4..d18921cdfa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,14 +8,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      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_pd_server_availability_zone:
         type: list
         required: true
@@ -34,16 +26,16 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_mac_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd02_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -66,25 +58,105 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd02_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      compute_pd_server_user_data_format:
+        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_pd02_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd02_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd02_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd02_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_pd02_port_network:
+      port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_user_data_format:
+      port_pd02_port_network:
         type: list
         required: true
         status: SUPPORTED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
index 8bc75d63cf..1e714f26c2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -100,9 +100,6 @@ topology_template:
           - 0
         port_pd01_port_replacement_policy:
         - AUTO
-        port_pd02_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
         vm_flavor_name:
           get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
@@ -118,6 +115,11 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
+        compute_pd_server_user_data_format:
+        - RAW
+        port_pd02_port_mac_requirements:
+        - mac_count_required:
+            is_required: false
         port_pd01_port_network:
         - packet_mirror_network
         port_pd02_port_ip_requirements:
@@ -128,8 +130,6 @@ topology_template:
               is_required: false
         port_pd02_port_network:
         - packet_mirror_network
-        compute_pd_server_user_data_format:
-        - RAW
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 9d86566e4f..64104dc20f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,13 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -33,14 +26,14 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_mac_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
     vm_flavor_name:
       type: string
       required: true
+    port_pd02_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -59,22 +52,89 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd02_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    compute_pd_server_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd02_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd02_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd02_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_network:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd02_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd02_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_pd02_port_network:
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_user_data_format:
+    port_pd02_port_network:
       type: list
       required: true
       entry_schema:
@@ -102,18 +162,42 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
@@ -126,18 +210,42 @@ topology_template:
     pd_server_pd02_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd02_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd02_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd02_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd02_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd02_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd02_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd02_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd02_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd02_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd02_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cd7b7cd904..b956d579e3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,26 +32,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_pd01_port_0_network_role_tag:
+      port_pd01_port_0_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      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_pd_server_availability_zone:
         type: list
         required: true
@@ -74,23 +60,35 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_mac_requirements:
+      port_pd01_port_1_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
+      port_pd01_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_replacement_policy:
+      port_pd01_port_1_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_1_network_role_tag:
+      port_pd01_port_0_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
@@ -108,6 +106,68 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_0_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_1_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      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_pd01_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_0_security_groups:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
index 215f5c0b83..7c295f9e48 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
@@ -109,14 +109,6 @@ topology_template:
               is_required: false
         port_pd01_port_1_security_groups:
         - - jsa_security_group
-        port_pd01_port_0_network_role_tag:
-        - oam
-        port_pd01_port_1_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -127,19 +119,27 @@ topology_template:
         - AUTO
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_1_mac_requirements:
-        - mac_count_required:
-            is_required: false
         vm_image_name:
           get_input: pd_image_name
-        port_pd01_port_1_replacement_policy:
-        - AUTO
         port_pd01_port_1_network_role_tag:
         - oam
         port_pd01_port_1_network:
         - get_input: oam_net_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd01_port_0_network_role_tag:
+        - oam
+        port_pd01_port_1_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_1_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        port_pd01_port_1_replacement_policy:
+        - AUTO
         port_pd01_port_0_security_groups:
         - - jsa_security_group
         service_template_filter:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index cc1724133c..75533f5049 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,23 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_pd01_port_0_network_role_tag:
+    port_pd01_port_0_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -66,20 +54,30 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_1_mac_requirements:
+    port_pd01_port_1_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
+    port_pd01_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     vm_image_name:
       type: string
       required: true
-    port_pd01_port_1_replacement_policy:
+    port_pd01_port_1_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_1_network_role_tag:
+    port_pd01_port_0_subnetpoolid:
       type: list
       required: true
       entry_schema:
@@ -94,6 +92,58 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_0_security_groups:
       type: list
       required: true
@@ -126,10 +176,18 @@ topology_template:
           get_input:
           - port_pd01_port_1_security_groups
           - index_value
+        exCP_naming:
+          get_input:
+          - port_pd01_port_1_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_1_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_1_ip_requirements
@@ -142,6 +200,18 @@ topology_template:
           get_input:
           - port_pd01_port_1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_1_network
@@ -158,10 +228,18 @@ topology_template:
           get_input:
           - port_pd01_port_0_security_groups
           - index_value
+        exCP_naming:
+          get_input:
+          - port_pd01_port_0_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_0_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_0_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_0_ip_requirements
@@ -174,6 +252,18 @@ topology_template:
           get_input:
           - port_pd01_port_0_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_0_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_0_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_0_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_0_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 00cd6b4b90..dc1dc15aaa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -26,20 +26,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_pd01_port_1_ip_requirements:
+      port_pd01_port_0_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      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
+          type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -62,17 +54,35 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_mac_requirements:
+      port_pd01_port_1_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
+      port_pd01_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_replacement_policy:
+      port_pd01_port_1_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_0_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
@@ -90,6 +100,68 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_0_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_1_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      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_pd01_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
index 7a45084d24..17966e0c2f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -114,12 +114,6 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        port_pd01_port_1_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -130,17 +124,23 @@ topology_template:
         - AUTO
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_1_mac_requirements:
-        - mac_count_required:
-            is_required: false
         vm_image_name:
           get_input: pd_image_name
-        port_pd01_port_1_replacement_policy:
-        - AUTO
         port_pd01_port_1_network:
         - packet_internal_network
         compute_pd_server_user_data_format:
         - RAW
+        port_pd01_port_1_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_1_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        port_pd01_port_1_replacement_policy:
+        - AUTO
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 44d11b66e1..560f18e726 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -26,18 +26,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_pd01_port_1_ip_requirements:
+    port_pd01_port_0_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
+        type: string
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -56,15 +49,30 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_1_mac_requirements:
+    port_pd01_port_1_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
+    port_pd01_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     vm_image_name:
       type: string
       required: true
-    port_pd01_port_1_replacement_policy:
+    port_pd01_port_1_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_0_subnetpoolid:
       type: list
       required: true
       entry_schema:
@@ -79,6 +87,58 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.nodes.heat.pd_server
@@ -102,18 +162,42 @@ topology_template:
     pd_server_pd01_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_1_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_1_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_1_network
@@ -126,18 +210,42 @@ topology_template:
     pd_server_pd01_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_0_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_0_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_0_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_0_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_0_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_0_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_0_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_0_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_0_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_0_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 058fb9d6bd..857c88bd2e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -34,10 +34,28 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd02_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd02_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd02_port_network_role_tag:
         type: list
         required: true
@@ -50,6 +68,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd02_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       vm_image_name:
         type: string
         required: true
@@ -66,6 +90,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd02_port_ip_requirements:
         type: list
         required: true
@@ -78,6 +132,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd02_port_network:
         type: list
         required: true
@@ -507,16 +567,23 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      oam_net_gw:
-        type: string
-        description: CPS network gateway
+      port_pcm_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -527,6 +594,62 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
+      port_pcm_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pcm_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pcm_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      pcm_server_name:
+        type: string
+        description: PCRF CM server name
+        required: true
+        status: SUPPORTED
+      cps_net_mask:
+        type: string
+        description: CPS network mask
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pcm_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      oam_net_name:
+        type: string
+        description: OAM network name
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      oam_net_gw:
+        type: string
+        description: CPS network gateway
+        required: true
+        status: SUPPORTED
       security_group_name:
         type: string
         description: the name of security group
@@ -542,6 +665,12 @@ node_types:
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       pcm_flavor_name:
         type: string
         description: flavor name of PCRF CM instance
@@ -552,21 +681,11 @@ node_types:
         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
@@ -577,11 +696,12 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      oam_net_name:
-        type: string
-        description: OAM network name
+      port_pcm_port_1_order:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: integer
     attributes:
       server_pcm_id:
         type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
index e9da306669..6d0690a78d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
@@ -33,9 +33,24 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_flavor_name:
       type: string
       required: true
+    port_pd02_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd02_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd02_port_network_role_tag:
       type: list
       required: true
@@ -46,6 +61,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_image_name:
       type: string
       required: true
@@ -59,6 +79,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd02_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd02_port_ip_requirements:
       type: list
       required: true
@@ -69,6 +114,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd02_port_network:
       type: list
       required: true
@@ -102,6 +152,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -114,6 +172,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
@@ -126,6 +196,14 @@ topology_template:
     pd_server_pd02_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd02_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd02_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd02_port_ip_requirements
@@ -138,6 +216,18 @@ topology_template:
           get_input:
           - port_pd02_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd02_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd02_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd02_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd02_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
index ba350ce357..8d7c6bd66a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,18 +11,22 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    oam_net_gw:
-      label: CPS network gateway
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network gateway
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_image_name:
       label: image name
       hidden: false
@@ -35,6 +39,60 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    pcm_server_name:
+      label: PCRF CM server name
+      hidden: false
+      immutable: false
+      type: string
+      description: PCRF CM server name
+    cps_net_mask:
+      label: CPS network mask
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    oam_net_name:
+      label: OAM network name
+      hidden: false
+      immutable: false
+      type: string
+      description: OAM network name
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    oam_net_gw:
+      label: CPS network gateway
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network gateway
     security_group_name:
       label: security group name
       hidden: false
@@ -53,6 +111,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
@@ -65,24 +128,12 @@ topology_template:
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    pcm_server_name:
-      label: PCRF CM server name
-      hidden: false
-      immutable: false
-      type: string
-      description: PCRF CM server name
     cps_net_name:
       label: CPS network name
       hidden: false
       immutable: false
       type: string
       description: CPS network name
-    cps_net_mask:
-      label: CPS network mask
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network mask
     oam_net_ip:
       label: OAM network ip
       hidden: false
@@ -95,12 +146,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    oam_net_name:
-      label: OAM network name
-      hidden: false
-      immutable: false
-      type: string
-      description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -113,15 +163,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -151,15 +221,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index af15bfb115..a308e85feb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
@@ -58,26 +64,80 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_1_network:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
index 236dc97e62..e2edfa3db1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_1_ip_requirements:
       type: list
       required: true
@@ -53,22 +58,67 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     vm_flavor_name:
       type: string
       required: true
+    port_pd01_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_1_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_pd01_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     vm_image_name:
       type: string
       required: true
+    port_pd01_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_1_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_1_network:
       type: list
       required: true
@@ -102,6 +152,14 @@ topology_template:
     pd_server_pd01_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_1_ip_requirements
@@ -114,6 +172,18 @@ topology_template:
           get_input:
           - port_pd01_port_1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_1_network
@@ -126,6 +196,14 @@ topology_template:
     pd_server_pd01_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_0_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_0_ip_requirements
@@ -138,6 +216,18 @@ topology_template:
           get_input:
           - port_pd01_port_0_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_0_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_0_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_0_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_0_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8d72374fc5..f6428554bf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -34,10 +34,28 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd02_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd02_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd02_port_network_role_tag:
         type: list
         required: true
@@ -50,6 +68,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd02_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       vm_image_name:
         type: string
         required: true
@@ -66,6 +90,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd02_port_ip_requirements:
         type: list
         required: true
@@ -78,6 +132,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd02_port_network:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 073e86d1cb..bd885f9dbe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -33,9 +33,24 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_flavor_name:
       type: string
       required: true
+    port_pd02_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd02_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd02_port_network_role_tag:
       type: list
       required: true
@@ -46,6 +61,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_image_name:
       type: string
       required: true
@@ -59,6 +79,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd02_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd02_port_ip_requirements:
       type: list
       required: true
@@ -69,6 +114,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd02_port_network:
       type: list
       required: true
@@ -102,6 +152,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -114,6 +172,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
@@ -126,6 +196,14 @@ topology_template:
     pd_server_pd02_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd02_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd02_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd02_port_ip_requirements
@@ -138,6 +216,18 @@ topology_template:
           get_input:
           - port_pd02_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd02_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd02_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd02_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd02_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d1f7bb0857..d53617ed8d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -14,6 +14,112 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB2_Internal2_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB_OAM_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      compute_FSB2_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal2_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB_OAM_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal1_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal2_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_FSB2_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal1_mac_address:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB_OAM_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal1_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal2_mac_address:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_FSB2_Internal2_mac_requirements:
         type: list
         required: true
@@ -40,41 +146,37 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_FSB2_Internal2_network:
+      port_FSB_OAM_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      compute_FSB2_availability_zone:
+          type: integer
+      port_FSB2_Internal2_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB_OAM_ip_requirements:
+      port_FSB2_Internal2_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_FSB2_Internal1_ip_requirements:
+      port_FSB2_Internal1_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      compute_FSB2_name:
+          type: integer
+      port_FSB2_Internal2_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal1_mac_address:
+      port_FSB2_Internal1_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
@@ -92,24 +194,24 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_FSB_OAM_network:
+      port_FSB2_Internal2_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_FSB2_Internal1_network:
+          type: integer
+      port_FSB2_Internal1_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal2_mac_address:
+      port_FSB_OAM_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
     requirements:
     - dependency_FSB2_FSB_OAM:
         capability: tosca.capabilities.Node
@@ -605,12 +707,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.VLC2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_VLC_SCTP_A_network:
+      port_VLC_GTP_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
       port_VLC_OAM_network_role_tag:
         type: list
         required: true
@@ -651,24 +753,24 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_OAM_ip_requirements:
+      port_VLC2_Internal1_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_VLC2_Internal2_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_OAM_fixed_ips:
+      port_VLC_GTP_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       vm_image_name:
         type: string
         required: true
@@ -691,36 +793,180 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_SCTP_A_ip_requirements:
+      port_VLC_SCTP_B_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_GTP_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC2_Internal1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_SCTP_B_network:
+      port_VLC_GTP_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_VLC_OAM_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_SCTP_A_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_GTP_network:
+      port_VLC_GTP_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_GTP_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_OAM_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC2_Internal1_ip_requirements:
+      port_VLC2_Internal2_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_A_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_A_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_VLC_SCTP_A_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_VLC_SCTP_B_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_SCTP_A_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_OAM_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_OAM_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_OAM_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC2_Internal1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_VLC_OAM_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_A_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC2_Internal2_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_SCTP_A_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_OAM_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_B_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       compute_VLC2_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_VLC_OAM_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_VLC2_Internal1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC2_Internal2_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -729,12 +975,42 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_VLC_SCTP_B_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC2_Internal2_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_VLC_SCTP_B_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_VLC_GTP_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_A_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC2_Internal2_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       port_VLC_GTP_mac_requirements:
         type: list
         required: true
@@ -753,7 +1029,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_GTP_fixed_ips:
+      port_VLC2_Internal1_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
@@ -765,7 +1041,13 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_OAM_network:
+      port_VLC2_Internal1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC2_Internal2_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
@@ -777,7 +1059,37 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC2_Internal2_network:
+      port_VLC2_Internal2_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_SCTP_B_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_VLC_GTP_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC2_Internal1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_B_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_SCTP_B_network_role:
         type: list
         required: true
         status: SUPPORTED
@@ -1512,6 +1824,80 @@ node_types:
   org.openecomp.resource.abstract.nodes.NCB1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_NCB1_Internal1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_NCB1_Internal2_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_NCB1_Internal1_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_NCB1_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_NCB1_Internal2_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_NCB1_Internal2_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_NCB1_Internal2_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_NCB1_Internal1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_NCB1_Internal1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_NCB1_Internal2_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_NCB1_Internal2_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_NCB1_Internal2_mac_address:
         type: list
         required: true
@@ -1532,29 +1918,31 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB1_Internal1_ip_requirements:
+      port_NCB1_Internal1_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_flavor_name:
-        type: string
+          type: integer
+      port_NCB1_Internal2_exCP_naming:
+        type: list
         required: true
         status: SUPPORTED
-      compute_NCB1_name:
+        entry_schema:
+          type: json
+      port_NCB1_Internal1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_NCB1_Internal1_mac_requirements:
+          type: json
+      port_NCB1_Internal1_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_NCB1_Internal2_mac_requirements:
+      port_NCB1_Internal1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -1572,16 +1960,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_NCB1_Internal2_ip_requirements:
+      port_NCB1_Internal2_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_NCB1_Internal2_network:
         type: list
         required: true
@@ -2005,6 +2389,62 @@ node_types:
   org.openecomp.resource.abstract.nodes.NCB2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      compute_NCB2_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_NCB2_Internal2_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_NCB2_Internal1_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_NCB2_Internal1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_NCB2_Internal2_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_NCB2_Internal1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_NCB2_Internal1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_NCB2_Internal2_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -2019,62 +2459,78 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_NCB2_availability_zone:
+      port_NCB2_Internal2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_NCB2_Internal2_ip_requirements:
+          type: json
+      port_NCB2_Internal2_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      vm_flavor_name:
-        type: string
+          type: string
+      port_NCB2_Internal2_network:
+        type: list
         required: true
         status: SUPPORTED
-      port_NCB2_Internal2_mac_requirements:
+        entry_schema:
+          type: string
+      port_NCB2_Internal2_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_NCB2_Internal2_network:
+      port_NCB2_Internal1_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB2_Internal1_mac_requirements:
+      port_NCB2_Internal2_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_NCB2_Internal1_mac_address:
+          type: string
+      port_NCB2_Internal1_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_NCB2_Internal2_mac_address:
+      port_NCB2_Internal1_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
+      port_NCB2_Internal2_order:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: integer
       compute_NCB2_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_NCB2_Internal1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_NCB2_Internal2_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_NCB2_Internal1_ip_requirements:
         type: list
         required: true
@@ -2498,6 +2954,74 @@ node_types:
   org.openecomp.resource.abstract.nodes.GPB2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_GPB2_Internal2_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_GPB2_Internal2_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_GPB2_Internal1_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_GPB2_Internal1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_GPB2_Internal2_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_GPB2_Internal2_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_GPB2_Internal1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_GPB2_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_GPB2_Internal1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_GPB2_Internal2_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_GPB2_Internal2_mac_address:
         type: list
         required: true
@@ -2516,7 +3040,7 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_GPB2_Internal1_network:
+      port_GPB2_Internal2_network_role:
         type: list
         required: true
         status: SUPPORTED
@@ -2536,27 +3060,31 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_GPB2_Internal2_exCP_naming:
+        type: list
         required: true
         status: SUPPORTED
-      port_GPB2_Internal1_mac_requirements:
+        entry_schema:
+          type: json
+      port_GPB2_Internal1_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_GPB2_Internal2_ip_requirements:
+          type: integer
+      port_GPB2_Internal1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
+      port_GPB2_Internal1_exCP_naming:
+        type: list
         required: true
         status: SUPPORTED
-      compute_GPB2_name:
+        entry_schema:
+          type: json
+      port_GPB2_Internal1_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
@@ -2997,36 +3525,42 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC1_Internal1_network:
+      port_VLC_GTP_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_VLC_SCTP_A_network:
+          type: json
+      port_VLC_OAM_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_OAM_network_role_tag:
+      port_VLC1_Internal1_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC1_Internal1_mac_address:
+      port_VLC_GTP_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_VLC_GTP_ip_requirements:
+          type: json
+      port_VLC1_Internal2_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_VLC1_Internal2_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_VLC_SCTP_A_mac_requirements:
         type: list
         required: true
@@ -3055,6 +3589,160 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_VLC1_Internal2_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_GTP_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_VLC1_Internal1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_B_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC1_Internal1_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_GTP_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_GTP_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_VLC_OAM_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC1_Internal1_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC1_Internal1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC1_Internal1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_VLC_SCTP_A_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_GTP_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_GTP_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_OAM_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_VLC1_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC1_Internal2_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC1_Internal1_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_A_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_A_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC1_Internal1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_A_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_VLC_SCTP_B_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_SCTP_A_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_OAM_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_VLC_OAM_ip_requirements:
         type: list
         required: true
@@ -3073,34 +3761,66 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      vm_image_name:
-        type: string
+      port_VLC1_Internal2_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_VLC_OAM_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC1_Internal2_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_VLC1_Internal2_subnetpoolid:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_VLC_SCTP_A_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_SCTP_B_network:
+      port_VLC_SCTP_A_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_GTP_network:
+      compute_VLC1_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_VLC1_availability_zone:
+      port_VLC_OAM_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_B_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_VLC_OAM_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -3109,66 +3829,84 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_VLC1_Internal1_mac_requirements:
+      port_VLC1_Internal2_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC1_Internal2_mac_requirements:
+      port_VLC_SCTP_B_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_VLC_SCTP_B_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_VLC_GTP_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_VLC_SCTP_A_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_VLC_GTP_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_GTP_fixed_ips:
+      port_VLC_OAM_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_OAM_mac_requirements:
+      port_VLC1_Internal1_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC_OAM_network:
+      port_VLC_SCTP_B_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_VLC1_name:
+          type: json
+      port_VLC_SCTP_B_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_VLC_GTP_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_VLC_SCTP_B_mac_requirements:
+      port_VLC_SCTP_B_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_VLC1_Internal2_ip_requirements:
+      port_VLC_SCTP_B_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
     requirements:
     - dependency_VLC1_VLC_SCTP_B:
         capability: tosca.capabilities.Node
@@ -3916,6 +4654,94 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB1_Internal1_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB_OAM_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal2_mac_address:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal2_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal1_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB_OAM_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal1_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB_OAM_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal2_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal1_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_FSB_OAM_mac_requirements:
         type: list
         required: true
@@ -3928,6 +4754,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB1_Internal1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -3936,28 +4768,24 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_FSB1_Internal1_network:
+      port_FSB_OAM_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal2_mac_address:
+          type: integer
+      port_FSB1_Internal1_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB_OAM_ip_requirements:
+      port_FSB1_Internal2_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_FSB1_Internal2_mac_requirements:
         type: list
         required: true
@@ -3970,36 +4798,48 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_FSB1_Internal2_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       port_FSB_OAM_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_FSB1_name:
+      port_FSB1_Internal1_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_FSB1_Internal1_mac_requirements:
+          type: json
+      port_FSB_OAM_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_FSB1_Internal1_ip_requirements:
+      compute_FSB1_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal2_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_FSB_OAM_network:
+      port_FSB1_Internal2_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
     requirements:
     - dependency_FSB1_FSB1_Internal2:
         capability: tosca.capabilities.Node
@@ -4495,21 +5335,13 @@ node_types:
   org.openecomp.resource.abstract.nodes.GPB1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_GPB1_Internal2_network:
+      port_GPB1_Internal1_network_role:
         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_GPB1_Internal1_network:
+      port_GPB1_Internal2_network_role:
         type: list
         required: true
         status: SUPPORTED
@@ -4525,29 +5357,29 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_GPB1_Internal2_mac_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_GPB1_Internal1_mac_address:
+      port_GPB1_Internal2_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_GPB1_Internal2_mac_address:
+      port_GPB1_Internal1_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: integer
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_GPB1_Internal1_ip_requirements:
+      port_GPB1_Internal1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_GPB1_Internal2_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
@@ -4565,12 +5397,92 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_GPB1_Internal1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_GPB1_Internal2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_GPB1_Internal2_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_GPB1_Internal1_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_GPB1_Internal2_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_GPB1_Internal1_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_GPB1_Internal2_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_GPB1_Internal1_mac_address:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_GPB1_Internal1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_GPB1_Internal2_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_GPB1_Internal2_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_GPB1_Internal1_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_GPB1_Internal2_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
     requirements:
     - dependency_GPB1:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml
index 8e78b6635d..8ae59dca18 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml
@@ -627,8 +627,6 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_VLC_SCTP_A_network:
-        - epc-sctp-a-net
         port_VLC_OAM_network_role_tag:
         - oam
         port_VLC_GTP_ip_requirements:
@@ -657,17 +655,8 @@ topology_template:
         port_VLC_SCTP_A_fixed_ips:
         - - ip_address:
               get_input: vlc2-sctp-a-ip
-        port_VLC_OAM_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
         port_VLC2_Internal2_mac_address:
         - get_input: vlc2-Internal2-mac
-        port_VLC_OAM_fixed_ips:
-        - - ip_address:
-              get_input: vlc2-oam-ip
         vm_image_name:
           get_input: pxe-image
         port_VLC2_Internal1_mac_address:
@@ -678,12 +667,6 @@ topology_template:
         port_VLC2_Internal1_mac_requirements:
         - mac_count_required:
             is_required: true
-        port_VLC_SCTP_A_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
         port_VLC_SCTP_B_network:
         - epc-sctp-b-net
         port_VLC_GTP_network:
@@ -694,6 +677,30 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
+        port_VLC_GTP_fixed_ips:
+        - - ip_address:
+              get_input: vlc2-gtp-ip
+        port_VLC_OAM_network:
+        - get_input: oam_net_id
+        port_VLC2_Internal2_network:
+        - Internal2-net
+        port_VLC_SCTP_A_network:
+        - epc-sctp-a-net
+        port_VLC_OAM_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: true
+            floating_ip_count_required:
+              is_required: false
+        port_VLC_OAM_fixed_ips:
+        - - ip_address:
+              get_input: vlc2-oam-ip
+        port_VLC_SCTP_A_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: true
+            floating_ip_count_required:
+              is_required: false
         compute_VLC2_name:
         - get_input: vlc2-name
         port_VLC_SCTP_B_fixed_ips:
@@ -706,19 +713,12 @@ topology_template:
         - Internal1-net
         compute_VLC2_availability_zone:
         - get_input: vlc_zone
-        port_VLC_GTP_fixed_ips:
-        - - ip_address:
-              get_input: vlc2-gtp-ip
         port_VLC_OAM_mac_requirements:
         - mac_count_required:
             is_required: false
-        port_VLC_OAM_network:
-        - get_input: oam_net_id
         port_VLC_SCTP_B_mac_requirements:
         - mac_count_required:
             is_required: false
-        port_VLC2_Internal2_network:
-        - Internal2-net
         service_template_filter:
           substitute_service_template: Nested_VLC2ServiceTemplate.yaml
           count: 1
@@ -755,10 +755,6 @@ topology_template:
       properties:
         port_VLC1_Internal2_mac_address:
         - get_input: vlc1-Internal2-mac
-        port_VLC1_Internal1_network:
-        - Internal1-net
-        port_VLC_SCTP_A_network:
-        - epc-sctp-a-net
         port_VLC_OAM_network_role_tag:
         - oam
         port_VLC1_Internal1_mac_address:
@@ -785,6 +781,32 @@ topology_template:
         port_VLC_SCTP_A_fixed_ips:
         - - ip_address:
               get_input: vlc1-sctp-a-ip
+        vm_image_name:
+          get_input: pxe-image
+        port_VLC_SCTP_B_network:
+        - epc-sctp-b-net
+        port_VLC_GTP_network:
+        - epc-gtp-net
+        port_VLC1_Internal1_mac_requirements:
+        - mac_count_required:
+            is_required: true
+        port_VLC_GTP_fixed_ips:
+        - - ip_address:
+              get_input: vlc1-gtp-ip
+        port_VLC_OAM_network:
+        - get_input: oam_net_id
+        compute_VLC1_name:
+        - get_input: vlc1-name
+        port_VLC1_Internal2_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_VLC1_Internal1_network:
+        - Internal1-net
+        port_VLC_SCTP_A_network:
+        - epc-sctp-a-net
         port_VLC_OAM_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -800,23 +822,14 @@ topology_template:
         port_VLC_OAM_fixed_ips:
         - - ip_address:
               get_input: vlc1-oam-ip
-        vm_image_name:
-          get_input: pxe-image
         port_VLC_SCTP_A_ip_requirements:
         - - ip_version: 4
             ip_count_required:
               is_required: true
             floating_ip_count_required:
               is_required: false
-        port_VLC_SCTP_B_network:
-        - epc-sctp-b-net
-        port_VLC_GTP_network:
-        - epc-gtp-net
         compute_VLC1_availability_zone:
         - get_input: vlc_zone
-        port_VLC1_Internal1_mac_requirements:
-        - mac_count_required:
-            is_required: true
         port_VLC1_Internal2_mac_requirements:
         - mac_count_required:
             is_required: true
@@ -826,25 +839,12 @@ topology_template:
         port_VLC_GTP_mac_requirements:
         - mac_count_required:
             is_required: false
-        port_VLC_GTP_fixed_ips:
-        - - ip_address:
-              get_input: vlc1-gtp-ip
         port_VLC_OAM_mac_requirements:
         - mac_count_required:
             is_required: false
-        port_VLC_OAM_network:
-        - get_input: oam_net_id
-        compute_VLC1_name:
-        - get_input: vlc1-name
         port_VLC_SCTP_B_mac_requirements:
         - mac_count_required:
             is_required: false
-        port_VLC1_Internal2_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         service_template_filter:
           substitute_service_template: Nested_VLC1ServiceTemplate.yaml
           count: 1
@@ -900,35 +900,35 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_GPB1_Internal2_network:
-        - Internal2-net
-        port_GPB1_Internal1_network:
-        - Internal1-net
         compute_GPB1_name:
         - get_input: gpb1-name
         vm_flavor_name:
           get_input: gpb-flavor
-        port_GPB1_Internal2_mac_requirements:
-        - mac_count_required:
-            is_required: true
-        port_GPB1_Internal1_mac_address:
-        - get_input: gpb1-Internal1-mac
         port_GPB1_Internal2_mac_address:
         - get_input: gpb1-Internal2-mac
         vm_image_name:
           get_input: pxe-image
-        port_GPB1_Internal1_ip_requirements:
+        port_GPB1_Internal1_mac_requirements:
+        - mac_count_required:
+            is_required: true
+        compute_GPB1_availability_zone:
+        - get_input: gpb_zone
+        port_GPB1_Internal2_ip_requirements:
         - - ip_version: 4
             ip_count_required:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        port_GPB1_Internal1_mac_requirements:
+        port_GPB1_Internal2_network:
+        - Internal2-net
+        port_GPB1_Internal1_network:
+        - Internal1-net
+        port_GPB1_Internal2_mac_requirements:
         - mac_count_required:
             is_required: true
-        compute_GPB1_availability_zone:
-        - get_input: gpb_zone
-        port_GPB1_Internal2_ip_requirements:
+        port_GPB1_Internal1_mac_address:
+        - get_input: gpb1-Internal1-mac
+        port_GPB1_Internal1_ip_requirements:
         - - ip_version: 4
             ip_count_required:
               is_required: false
@@ -956,6 +956,20 @@ topology_template:
       directives:
       - substitutable
       properties:
+        port_GPB2_Internal1_network:
+        - Internal1-net
+        vm_flavor_name:
+          get_input: gpb-flavor
+        port_GPB2_Internal2_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        vm_image_name:
+          get_input: pxe-image
+        compute_GPB2_name:
+        - get_input: gpb2-name
         port_GPB2_Internal2_mac_address:
         - get_input: gpb2-Internal2-mac
         port_GPB2_Internal2_mac_requirements:
@@ -967,25 +981,11 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        port_GPB2_Internal1_network:
-        - Internal1-net
         compute_GPB2_availability_zone:
         - get_input: gpb_zone
-        vm_flavor_name:
-          get_input: gpb-flavor
         port_GPB2_Internal1_mac_requirements:
         - mac_count_required:
             is_required: true
-        port_GPB2_Internal2_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        vm_image_name:
-          get_input: pxe-image
-        compute_GPB2_name:
-        - get_input: gpb2-name
         port_GPB2_Internal1_mac_address:
         - get_input: gpb2-Internal1-mac
         port_GPB2_Internal2_network:
@@ -1051,6 +1051,21 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_input: ncb-flavor
+        compute_NCB1_name:
+        - get_input: ncb1-name
+        port_NCB1_Internal2_mac_requirements:
+        - mac_count_required:
+            is_required: true
+        vm_image_name:
+          get_input: pxe-image
+        port_NCB1_Internal2_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
         port_NCB1_Internal2_mac_address:
         - get_input: ncb1-Internal2-mac
         port_NCB1_Internal1_mac_address:
@@ -1061,28 +1076,13 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        vm_flavor_name:
-          get_input: ncb-flavor
-        compute_NCB1_name:
-        - get_input: ncb1-name
         port_NCB1_Internal1_mac_requirements:
         - mac_count_required:
             is_required: true
-        port_NCB1_Internal2_mac_requirements:
-        - mac_count_required:
-            is_required: true
         port_NCB1_Internal1_network:
         - Internal1-net
         compute_NCB1_availability_zone:
         - get_input: ncb_zone
-        vm_image_name:
-          get_input: pxe-image
-        port_NCB1_Internal2_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         port_NCB1_Internal2_network:
         - Internal2-net
         service_template_filter:
@@ -1107,32 +1107,32 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_NCB2_Internal1_network:
-        - Internal1-net
         compute_NCB2_availability_zone:
         - get_input: ncb_zone
-        port_NCB2_Internal2_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         vm_flavor_name:
           get_input: ncb-flavor
         port_NCB2_Internal2_mac_requirements:
         - mac_count_required:
             is_required: true
-        port_NCB2_Internal2_network:
-        - Internal2-net
         port_NCB2_Internal1_mac_requirements:
         - mac_count_required:
             is_required: true
+        vm_image_name:
+          get_input: pxe-image
+        port_NCB2_Internal1_network:
+        - Internal1-net
+        port_NCB2_Internal2_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_NCB2_Internal2_network:
+        - Internal2-net
         port_NCB2_Internal1_mac_address:
         - get_input: ncb2-Internal1-mac
         port_NCB2_Internal2_mac_address:
         - get_input: ncb2-Internal2-mac
-        vm_image_name:
-          get_input: pxe-image
         compute_NCB2_name:
         - get_input: ncb2-name
         port_NCB2_Internal1_ip_requirements:
@@ -1187,11 +1187,6 @@ topology_template:
         - oam
         port_FSB1_Internal2_network:
         - Internal2-net
-        port_FSB_OAM_mac_requirements:
-        - mac_count_required:
-            is_required: false
-        compute_FSB1_availability_zone:
-        - get_input: fsb_zone
         port_FSB1_Internal1_network:
         - Internal1-net
         vm_flavor_name:
@@ -1204,31 +1199,36 @@ topology_template:
               is_required: true
             floating_ip_count_required:
               is_required: false
-        port_FSB1_Internal2_mac_requirements:
+        port_FSB1_Internal1_mac_requirements:
         - mac_count_required:
             is_required: true
-        port_FSB1_Internal2_ip_requirements:
+        port_FSB1_Internal1_ip_requirements:
         - - ip_version: 4
             ip_count_required:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        port_FSB_OAM_fixed_ips:
-        - - ip_address:
-              get_input: fsb1-oam-ip
-        compute_FSB1_name:
-        - get_input: fsb1-name
-        port_FSB1_Internal1_mac_requirements:
+        port_FSB_OAM_network:
+        - get_input: oam_net_id
+        port_FSB_OAM_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        compute_FSB1_availability_zone:
+        - get_input: fsb_zone
+        port_FSB1_Internal2_mac_requirements:
         - mac_count_required:
             is_required: true
-        port_FSB1_Internal1_ip_requirements:
+        port_FSB1_Internal2_ip_requirements:
         - - ip_version: 4
             ip_count_required:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        port_FSB_OAM_network:
-        - get_input: oam_net_id
+        port_FSB_OAM_fixed_ips:
+        - - ip_address:
+              get_input: fsb1-oam-ip
+        compute_FSB1_name:
+        - get_input: fsb1-name
         service_template_filter:
           substitute_service_template: Nested_FSB1ServiceTemplate.yaml
           count: 1
@@ -1253,20 +1253,6 @@ topology_template:
       properties:
         port_FSB_OAM_network_role_tag:
         - oam
-        port_FSB2_Internal2_mac_requirements:
-        - mac_count_required:
-            is_required: true
-        port_FSB_OAM_mac_requirements:
-        - mac_count_required:
-            is_required: false
-        port_FSB2_Internal2_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        port_FSB2_Internal2_network:
-        - Internal2-net
         vm_flavor_name:
           get_input: fsb2-flavor
         compute_FSB2_availability_zone:
@@ -1287,18 +1273,32 @@ topology_template:
         - get_input: fsb2-name
         port_FSB2_Internal1_mac_address:
         - get_input: fsb2-Internal1-mac
-        port_FSB_OAM_fixed_ips:
-        - - ip_address:
-              get_input: fsb2-oam-ip
-        port_FSB2_Internal1_mac_requirements:
-        - mac_count_required:
-            is_required: true
         port_FSB_OAM_network:
         - get_input: oam_net_id
         port_FSB2_Internal1_network:
         - Internal1-net
         port_FSB2_Internal2_mac_address:
         - get_input: fsb2-Internal2-mac
+        port_FSB2_Internal2_mac_requirements:
+        - mac_count_required:
+            is_required: true
+        port_FSB_OAM_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        port_FSB2_Internal2_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_FSB2_Internal2_network:
+        - Internal2-net
+        port_FSB_OAM_fixed_ips:
+        - - ip_address:
+              get_input: fsb2-oam-ip
+        port_FSB2_Internal1_mac_requirements:
+        - mac_count_required:
+            is_required: true
         service_template_filter:
           substitute_service_template: Nested_FSB2ServiceTemplate.yaml
           count: 1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml
index 4331ecaa03..42ba1a647f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml
@@ -26,6 +26,79 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB1_Internal1_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal2_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal2_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal1_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal2_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal1_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_FSB_OAM_mac_requirements:
       type: list
       required: true
@@ -36,6 +109,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB1_Internal1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -43,24 +121,21 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_FSB1_Internal1_network:
+    port_FSB_OAM_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
-    port_FSB1_Internal2_mac_address:
+        type: integer
+    port_FSB1_Internal1_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB_OAM_ip_requirements:
+    port_FSB1_Internal2_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_FSB1_Internal2_mac_requirements:
       type: list
       required: true
@@ -71,43 +146,77 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_FSB1_Internal2_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     port_FSB_OAM_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_FSB1_name:
+    port_FSB1_Internal1_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB1_Internal1_mac_requirements:
+        type: json
+    port_FSB_OAM_exCP_naming:
       type: list
       required: true
       entry_schema:
         type: json
-    port_FSB1_Internal1_ip_requirements:
+    compute_FSB1_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal2_exCP_naming:
       type: list
       required: true
       entry_schema:
         type: json
-    port_FSB_OAM_network:
+    port_FSB1_Internal2_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
   node_templates:
     FSB1_FSB1_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB1_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB1_Internal2_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_FSB1_Internal2_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB1_Internal2_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_FSB1_Internal2_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_FSB1_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB1_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB1_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB1_Internal2_network
@@ -124,14 +233,38 @@ topology_template:
     FSB1_FSB1_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB1_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB1_Internal1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_FSB1_Internal1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB1_Internal1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_FSB1_Internal1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_FSB1_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB1_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB1_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB1_Internal1_network
@@ -148,6 +281,14 @@ topology_template:
     FSB1_FSB_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB_OAM_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB_OAM_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_FSB_OAM_ip_requirements
@@ -160,6 +301,18 @@ topology_template:
           get_input:
           - port_FSB_OAM_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_FSB_OAM_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB_OAM_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB_OAM_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_FSB_OAM_fixed_ips
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml
index a4d2f79275..a71818c237 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml
@@ -16,6 +16,94 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB2_Internal2_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    compute_FSB2_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_FSB2_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_FSB2_Internal2_mac_requirements:
       type: list
       required: true
@@ -38,35 +126,32 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_FSB2_Internal2_network:
+    port_FSB_OAM_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
-    compute_FSB2_availability_zone:
+        type: integer
+    port_FSB2_Internal2_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB_OAM_ip_requirements:
+    port_FSB2_Internal2_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_FSB2_Internal1_ip_requirements:
+    port_FSB2_Internal1_order:
       type: list
       required: true
       entry_schema:
-        type: json
-    compute_FSB2_name:
+        type: integer
+    port_FSB2_Internal2_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal1_mac_address:
+    port_FSB2_Internal1_network_role_tag:
       type: list
       required: true
       entry_schema:
@@ -81,25 +166,33 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_FSB_OAM_network:
+    port_FSB2_Internal2_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB2_Internal1_network:
+        type: integer
+    port_FSB2_Internal1_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal2_mac_address:
+    port_FSB_OAM_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
   node_templates:
     FSB2_FSB_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB_OAM_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB_OAM_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_FSB_OAM_ip_requirements
@@ -112,6 +205,18 @@ topology_template:
           get_input:
           - port_FSB_OAM_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_FSB_OAM_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB_OAM_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB_OAM_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_FSB_OAM_fixed_ips
@@ -141,14 +246,38 @@ topology_template:
     FSB2_FSB2_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal2_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_FSB2_Internal2_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal2_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_FSB2_Internal2_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal2_network
@@ -165,14 +294,38 @@ topology_template:
     FSB2_FSB2_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_FSB2_Internal1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_FSB2_Internal1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal1_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml
index b8e6141f9b..04066334b2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml
@@ -11,19 +11,12 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_GPB1_Internal2_network:
+    port_GPB1_Internal1_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    port_GPB1_Internal1_network:
+    port_GPB1_Internal2_network_role:
       type: list
       required: true
       entry_schema:
@@ -36,25 +29,25 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_GPB1_Internal2_mac_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
-    port_GPB1_Internal1_mac_address:
+    port_GPB1_Internal2_mac_address:
       type: list
       required: true
       entry_schema:
         type: string
-    port_GPB1_Internal2_mac_address:
+    port_GPB1_Internal1_order:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: integer
     vm_image_name:
       type: string
       required: true
-    port_GPB1_Internal1_ip_requirements:
+    port_GPB1_Internal1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_GPB1_Internal2_exCP_naming:
       type: list
       required: true
       entry_schema:
@@ -69,11 +62,78 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_GPB1_Internal1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_GPB1_Internal2_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_GPB1_Internal2_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_GPB1_Internal1_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_GPB1_Internal2_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_GPB1_Internal1_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_GPB1_Internal2_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_GPB1_Internal1_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_GPB1_Internal1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_GPB1_Internal2_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_GPB1_Internal2_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_GPB1_Internal1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_GPB1_Internal2_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
   node_templates:
     GPB1:
       type: org.openecomp.resource.vfc.nodes.heat.GPB1
@@ -93,14 +153,38 @@ topology_template:
     GPB1_GPB1_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_GPB1_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_GPB1_Internal1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_GPB1_Internal1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_GPB1_Internal1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_GPB1_Internal1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_GPB1_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_GPB1_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_GPB1_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_GPB1_Internal1_network
@@ -117,14 +201,38 @@ topology_template:
     GPB1_GPB1_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_GPB1_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_GPB1_Internal2_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_GPB1_Internal2_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_GPB1_Internal2_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_GPB1_Internal2_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_GPB1_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_GPB1_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_GPB1_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_GPB1_Internal2_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml
index 3598778212..64a239a2a5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml
@@ -11,6 +11,62 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_GPB2_Internal2_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_GPB2_Internal2_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_GPB2_Internal1_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_GPB2_Internal1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_GPB2_Internal2_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_GPB2_Internal2_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_GPB2_Internal1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_GPB2_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_GPB2_Internal1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_GPB2_Internal2_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_GPB2_Internal2_mac_address:
       type: list
       required: true
@@ -26,7 +82,7 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_GPB2_Internal1_network:
+    port_GPB2_Internal2_network_role:
       type: list
       required: true
       entry_schema:
@@ -43,23 +99,27 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_GPB2_Internal2_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_GPB2_Internal1_order:
+      type: list
       required: true
+      entry_schema:
+        type: integer
     port_GPB2_Internal1_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_GPB2_Internal2_ip_requirements:
+    port_GPB2_Internal1_exCP_naming:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
-      required: true
-    compute_GPB2_name:
+    port_GPB2_Internal1_network_role_tag:
       type: list
       required: true
       entry_schema:
@@ -78,14 +138,38 @@ topology_template:
     GPB2_GPB2_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_GPB2_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_GPB2_Internal2_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_GPB2_Internal2_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_GPB2_Internal2_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_GPB2_Internal2_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_GPB2_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_GPB2_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_GPB2_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_GPB2_Internal2_network
@@ -102,14 +186,38 @@ topology_template:
     GPB2_GPB2_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_GPB2_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_GPB2_Internal1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_GPB2_Internal1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_GPB2_Internal1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_GPB2_Internal1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_GPB2_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_GPB2_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_GPB2_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_GPB2_Internal1_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml
index f0a3aaf507..c41603b6bd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml
@@ -11,6 +11,67 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_NCB1_Internal1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_NCB1_Internal2_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_NCB1_Internal1_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    compute_NCB1_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_NCB1_Internal2_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_NCB1_Internal2_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_NCB1_Internal2_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_NCB1_Internal1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_NCB1_Internal1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_NCB1_Internal2_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_NCB1_Internal2_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_NCB1_Internal2_mac_address:
       type: list
       required: true
@@ -28,25 +89,27 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_NCB1_Internal1_ip_requirements:
+    port_NCB1_Internal1_order:
       type: list
       required: true
       entry_schema:
-        type: json
-    vm_flavor_name:
-      type: string
+        type: integer
+    port_NCB1_Internal2_exCP_naming:
+      type: list
       required: true
-    compute_NCB1_name:
+      entry_schema:
+        type: json
+    port_NCB1_Internal1_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_NCB1_Internal1_mac_requirements:
+        type: json
+    port_NCB1_Internal1_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_NCB1_Internal2_mac_requirements:
+    port_NCB1_Internal1_mac_requirements:
       type: list
       required: true
       entry_schema:
@@ -61,14 +124,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
-    port_NCB1_Internal2_ip_requirements:
+    port_NCB1_Internal2_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_NCB1_Internal2_network:
       type: list
       required: true
@@ -93,14 +153,38 @@ topology_template:
     NCB1_NCB1_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_NCB1_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_NCB1_Internal1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_NCB1_Internal1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_NCB1_Internal1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_NCB1_Internal1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_NCB1_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_NCB1_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_NCB1_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_NCB1_Internal1_network
@@ -117,14 +201,38 @@ topology_template:
     NCB1_NCB1_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_NCB1_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_NCB1_Internal2_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_NCB1_Internal2_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_NCB1_Internal2_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_NCB1_Internal2_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_NCB1_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_NCB1_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_NCB1_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_NCB1_Internal2_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml
index 7cfca623fa..3ff3a61c8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml
@@ -11,6 +11,52 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    compute_NCB2_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_NCB2_Internal2_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_NCB2_Internal1_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_NCB2_Internal1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_NCB2_Internal2_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_NCB2_Internal1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_NCB2_Internal1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_NCB2_Internal2_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -23,30 +69,22 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    compute_NCB2_availability_zone:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     port_NCB2_Internal2_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
-      required: true
-    port_NCB2_Internal2_mac_requirements:
+    port_NCB2_Internal2_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_NCB2_Internal2_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_NCB2_Internal1_mac_requirements:
+    port_NCB2_Internal2_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -61,14 +99,36 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
+    port_NCB2_Internal1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_NCB2_Internal1_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_NCB2_Internal2_order:
+      type: list
       required: true
+      entry_schema:
+        type: integer
     compute_NCB2_name:
       type: list
       required: true
       entry_schema:
         type: string
+    port_NCB2_Internal1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_NCB2_Internal2_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_NCB2_Internal1_ip_requirements:
       type: list
       required: true
@@ -93,14 +153,38 @@ topology_template:
     NCB2_NCB2_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_NCB2_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_NCB2_Internal1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_NCB2_Internal1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_NCB2_Internal1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_NCB2_Internal1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_NCB2_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_NCB2_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_NCB2_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_NCB2_Internal1_network
@@ -117,14 +201,38 @@ topology_template:
     NCB2_NCB2_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_NCB2_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_NCB2_Internal2_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_NCB2_Internal2_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_NCB2_Internal2_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_NCB2_Internal2_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_NCB2_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_NCB2_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_NCB2_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_NCB2_Internal2_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml
index 3fbc173efe..d1f52d6035 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml
@@ -16,16 +16,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_VLC1_Internal1_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_VLC_SCTP_A_network:
+    port_VLC_GTP_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
     port_VLC_OAM_network_role_tag:
       type: list
       required: true
@@ -41,6 +36,16 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_VLC1_Internal2_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC1_Internal2_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_VLC_SCTP_A_mac_requirements:
       type: list
       required: true
@@ -64,6 +69,134 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_VLC1_Internal2_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_GTP_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_image_name:
+      type: string
+      required: true
+    port_VLC1_Internal1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_B_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC1_Internal1_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_GTP_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_GTP_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_VLC_OAM_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC1_Internal1_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC1_Internal1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC1_Internal1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_VLC_SCTP_A_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_GTP_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_GTP_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_VLC1_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC1_Internal2_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC1_Internal1_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_A_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_A_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC1_Internal1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_A_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_VLC_SCTP_B_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_SCTP_A_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_VLC_OAM_ip_requirements:
       type: list
       required: true
@@ -79,29 +212,56 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    vm_image_name:
-      type: string
+    port_VLC1_Internal2_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
+    port_VLC_OAM_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC1_Internal2_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_VLC1_Internal2_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_VLC_SCTP_A_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_VLC_SCTP_B_network:
+    port_VLC_SCTP_A_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_VLC_GTP_network:
+    compute_VLC1_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_VLC1_availability_zone:
+    port_VLC_OAM_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_B_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_VLC_OAM_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -109,68 +269,107 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_VLC1_Internal1_mac_requirements:
+    port_VLC1_Internal2_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_VLC1_Internal2_mac_requirements:
+    port_VLC_SCTP_B_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_VLC_SCTP_B_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: json
+    port_VLC_GTP_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_A_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_VLC_GTP_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_VLC_GTP_fixed_ips:
+    port_VLC_OAM_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_VLC_OAM_mac_requirements:
+    port_VLC1_Internal1_exCP_naming:
       type: list
       required: true
       entry_schema:
         type: json
-    port_VLC_OAM_network:
+    port_VLC_SCTP_B_mac_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_VLC1_name:
+        type: json
+    port_VLC_SCTP_B_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_VLC_GTP_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_VLC_SCTP_B_mac_requirements:
+    port_VLC_SCTP_B_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_VLC1_Internal2_ip_requirements:
+    port_VLC_SCTP_B_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
   node_templates:
     VLC1_VLC_SCTP_B:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC_SCTP_B_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC_SCTP_B_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC_SCTP_B_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_VLC_SCTP_B_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_VLC_SCTP_B_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC_SCTP_B_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC_SCTP_B_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC_SCTP_B_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_VLC_SCTP_B_fixed_ips
@@ -187,14 +386,38 @@ topology_template:
     VLC1_VLC1_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC1_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC1_Internal2_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC1_Internal2_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_VLC1_Internal2_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_VLC1_Internal2_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC1_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC1_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC1_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_VLC1_Internal2_network
@@ -211,14 +434,38 @@ topology_template:
     VLC1_VLC1_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC1_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC1_Internal1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC1_Internal1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_VLC1_Internal1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_VLC1_Internal1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC1_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC1_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC1_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_VLC1_Internal1_network
@@ -235,6 +482,14 @@ topology_template:
     VLC1_VLC_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC_OAM_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC_OAM_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC_OAM_ip_requirements
@@ -247,6 +502,18 @@ topology_template:
           get_input:
           - port_VLC_OAM_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC_OAM_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC_OAM_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC_OAM_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_VLC_OAM_fixed_ips
@@ -263,14 +530,38 @@ topology_template:
     VLC1_VLC_SCTP_A:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC_SCTP_A_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC_SCTP_A_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC_SCTP_A_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_VLC_SCTP_A_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_VLC_SCTP_A_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC_SCTP_A_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC_SCTP_A_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC_SCTP_A_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_VLC_SCTP_A_fixed_ips
@@ -302,14 +593,38 @@ topology_template:
     VLC1_VLC_GTP:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC_GTP_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC_GTP_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC_GTP_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_VLC_GTP_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_VLC_GTP_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC_GTP_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC_GTP_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC_GTP_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_VLC_GTP_fixed_ips
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml
index cb60cfcff3..75b8246a49 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml
@@ -11,11 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_VLC_SCTP_A_network:
+    port_VLC_GTP_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
     port_VLC_OAM_network_role_tag:
       type: list
       required: true
@@ -49,21 +49,21 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_VLC_OAM_ip_requirements:
+    port_VLC2_Internal1_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_VLC2_Internal2_mac_address:
       type: list
       required: true
       entry_schema:
         type: string
-    port_VLC_OAM_fixed_ips:
+    port_VLC_GTP_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     vm_image_name:
       type: string
       required: true
@@ -82,31 +82,151 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_VLC_SCTP_A_ip_requirements:
+    port_VLC_SCTP_B_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_GTP_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC2_Internal1_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_VLC_SCTP_B_network:
+    port_VLC_GTP_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_VLC_OAM_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_SCTP_A_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    port_VLC_GTP_network:
+    port_VLC_GTP_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_GTP_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_OAM_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_VLC2_Internal1_ip_requirements:
+    port_VLC2_Internal2_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_A_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_A_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_SCTP_A_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_VLC_SCTP_B_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_SCTP_A_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_OAM_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_OAM_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: json
+    port_VLC2_Internal1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_VLC_OAM_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_A_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC2_Internal2_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_SCTP_A_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_OAM_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_B_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_VLC2_name:
       type: list
       required: true
       entry_schema:
         type: string
+    port_VLC_OAM_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_VLC2_Internal1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC2_Internal2_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -114,11 +234,36 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_VLC_SCTP_B_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC2_Internal2_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_VLC_SCTP_B_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: json
+    port_VLC_GTP_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_A_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC2_Internal2_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     port_VLC_GTP_mac_requirements:
       type: list
       required: true
@@ -134,7 +279,7 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_VLC_GTP_fixed_ips:
+    port_VLC2_Internal1_exCP_naming:
       type: list
       required: true
       entry_schema:
@@ -144,7 +289,12 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_VLC_OAM_network:
+    port_VLC2_Internal1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC2_Internal2_subnetpoolid:
       type: list
       required: true
       entry_schema:
@@ -154,7 +304,32 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_VLC2_Internal2_network:
+    port_VLC2_Internal2_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_SCTP_B_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_VLC_GTP_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC2_Internal1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_VLC_SCTP_B_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_VLC_SCTP_B_network_role:
       type: list
       required: true
       entry_schema:
@@ -163,14 +338,38 @@ topology_template:
     VLC2_VLC2_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC2_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC2_Internal2_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC2_Internal2_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_VLC2_Internal2_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_VLC2_Internal2_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC2_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC2_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC2_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_VLC2_Internal2_network
@@ -187,6 +386,14 @@ topology_template:
     VLC2_VLC_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC_OAM_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC_OAM_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC_OAM_ip_requirements
@@ -199,6 +406,18 @@ topology_template:
           get_input:
           - port_VLC_OAM_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC_OAM_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC_OAM_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC_OAM_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_VLC_OAM_fixed_ips
@@ -215,14 +434,38 @@ topology_template:
     VLC2_VLC2_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC2_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC2_Internal1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC2_Internal1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_VLC2_Internal1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_VLC2_Internal1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC2_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC2_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC2_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_VLC2_Internal1_network
@@ -239,14 +482,38 @@ topology_template:
     VLC2_VLC_SCTP_A:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC_SCTP_A_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC_SCTP_A_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC_SCTP_A_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_VLC_SCTP_A_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_VLC_SCTP_A_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC_SCTP_A_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC_SCTP_A_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC_SCTP_A_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_VLC_SCTP_A_fixed_ips
@@ -263,14 +530,38 @@ topology_template:
     VLC2_VLC_SCTP_B:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC_SCTP_B_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC_SCTP_B_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC_SCTP_B_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_VLC_SCTP_B_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_VLC_SCTP_B_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC_SCTP_B_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC_SCTP_B_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC_SCTP_B_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_VLC_SCTP_B_fixed_ips
@@ -287,14 +578,38 @@ topology_template:
     VLC2_VLC_GTP:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_VLC_GTP_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_VLC_GTP_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_VLC_GTP_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_VLC_GTP_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_VLC_GTP_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_VLC_GTP_order
+          - index_value
+        network_role:
+          get_input:
+          - port_VLC_GTP_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_VLC_GTP_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_VLC_GTP_fixed_ips
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 07792bad3d..b9579e65a7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -34,10 +34,28 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd02_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd02_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd02_port_network_role_tag:
         type: list
         required: true
@@ -50,6 +68,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd02_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       vm_image_name:
         type: string
         required: true
@@ -66,6 +90,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd02_port_ip_requirements:
         type: list
         required: true
@@ -78,6 +132,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd02_port_network:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
index 2dc08c62ba..3dce505771 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -33,9 +33,24 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_flavor_name:
       type: string
       required: true
+    port_pd02_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd02_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd02_port_network_role_tag:
       type: list
       required: true
@@ -46,6 +61,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_image_name:
       type: string
       required: true
@@ -59,6 +79,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd02_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd02_port_ip_requirements:
       type: list
       required: true
@@ -69,6 +114,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd02_port_network:
       type: list
       required: true
@@ -102,6 +152,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -114,6 +172,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
@@ -126,6 +196,14 @@ topology_template:
     pd_server_pd02_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd02_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd02_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd02_port_ip_requirements
@@ -138,6 +216,18 @@ topology_template:
           get_input:
           - port_pd02_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd02_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd02_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd02_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd02_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 57acfc92a7..b003fc2638 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -34,10 +34,28 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd02_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd02_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd02_port_network_role_tag:
         type: list
         required: true
@@ -50,6 +68,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd02_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       vm_image_name:
         type: string
         required: true
@@ -66,12 +90,54 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd02_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd02_port_network:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
index e9f880a804..6d0690a78d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -33,9 +33,24 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_flavor_name:
       type: string
       required: true
+    port_pd02_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd02_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd02_port_network_role_tag:
       type: list
       required: true
@@ -46,6 +61,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_image_name:
       type: string
       required: true
@@ -59,11 +79,46 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd02_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd02_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd02_port_network:
       type: list
       required: true
@@ -97,14 +152,38 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
@@ -117,6 +196,14 @@ topology_template:
     pd_server_pd02_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd02_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd02_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd02_port_ip_requirements
@@ -129,6 +216,18 @@ topology_template:
           get_input:
           - port_pd02_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd02_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd02_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd02_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd02_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 49604b2074..a308e85feb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -26,6 +26,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_0_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
@@ -52,26 +64,80 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_1_network:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
index 96061d140c..e2edfa3db1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -26,6 +26,16 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd01_port_0_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_1_ip_requirements:
       type: list
       required: true
@@ -48,22 +58,67 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     vm_flavor_name:
       type: string
       required: true
+    port_pd01_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_1_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_pd01_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     vm_image_name:
       type: string
       required: true
+    port_pd01_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_1_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_1_network:
       type: list
       required: true
@@ -97,6 +152,14 @@ topology_template:
     pd_server_pd01_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_1_ip_requirements
@@ -109,6 +172,18 @@ topology_template:
           get_input:
           - port_pd01_port_1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_1_network
@@ -121,14 +196,38 @@ topology_template:
     pd_server_pd01_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_0_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_0_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_0_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_0_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_0_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_0_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_0_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_0_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f6ae733527..c9e53c828b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
@@ -58,26 +64,80 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_1_network:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 88138e2374..9103bf7fa2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_1_ip_requirements:
       type: list
       required: true
@@ -53,22 +58,67 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     vm_flavor_name:
       type: string
       required: true
+    port_pd01_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_1_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_pd01_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     vm_image_name:
       type: string
       required: true
+    port_pd01_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_1_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_1_network:
       type: list
       required: true
@@ -102,6 +152,14 @@ topology_template:
     pd_server_pd01_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_1_ip_requirements
@@ -114,6 +172,18 @@ topology_template:
           get_input:
           - port_pd01_port_1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_1_network
@@ -126,6 +196,14 @@ topology_template:
     pd_server_pd01_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_0_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_0_ip_requirements
@@ -138,6 +216,18 @@ topology_template:
           get_input:
           - port_pd01_port_0_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_0_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_0_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_0_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_0_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 380f7bb1dc..2ad9165c79 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_0_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
@@ -58,26 +64,80 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_1_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_1_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_0_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_1_network:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index d9d82c2f68..0554f63c37 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_1_ip_requirements:
       type: list
       required: true
@@ -53,22 +58,67 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     vm_flavor_name:
       type: string
       required: true
+    port_pd01_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_1_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_pd01_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     vm_image_name:
       type: string
       required: true
+    port_pd01_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_1_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_1_network:
       type: list
       required: true
@@ -102,6 +152,14 @@ topology_template:
     pd_server_pd01_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_1_ip_requirements
@@ -114,6 +172,18 @@ topology_template:
           get_input:
           - port_pd01_port_1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_1_network
@@ -126,6 +196,14 @@ topology_template:
     pd_server_pd01_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_0_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_0_ip_requirements
@@ -138,6 +216,18 @@ topology_template:
           get_input:
           - port_pd01_port_0_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_0_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_0_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_0_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_0_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7c9866a5f0..7d05b9ccc7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,13 +8,49 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pd01_port_mac_requirements:
+      compute_pd_server_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_pd_server_scheduler_hints:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_security_groups:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -36,42 +72,36 @@ node_types:
         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_pd_server_availability_zone:
+      port_pd01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_name:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pd01_port_security_groups:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -428,6 +458,30 @@ node_types:
   org.openecomp.resource.abstract.nodes.oam_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_security_groups:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -456,18 +510,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      vm_flavor_name:
-        type: string
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_oam_server_user_data_format:
         type: list
         required: true
@@ -480,18 +534,24 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_security_groups:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
       port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_oam_server_scheduler_hints:
         type: list
         required: true
@@ -843,22 +903,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.ps_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pd01_port_mac_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
       compute_ps_server_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
-        required: true
-        status: SUPPORTED
       compute_ps_server_availability_zone:
         type: list
         required: true
@@ -877,6 +927,40 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      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_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_security_groups:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_ip_requirements:
         type: list
         required: true
@@ -889,19 +973,31 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      vm_flavor_name:
-        type: string
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_security_groups:
+        entry_schema:
+          type: string
+      port_pd01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
index 104d72f82a..21a0a374de 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
@@ -202,21 +202,8 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pd01_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
         compute_pd_server_scheduler_hints:
         - group: BE_Affinity_group
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        port_pd01_port_network:
-        - get_input: oam_net_name
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -229,6 +216,19 @@ topology_template:
           - name
         port_pd01_port_security_groups:
         - - jsa_security_group
+        port_pd01_port_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        port_pd01_port_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_network:
+        - get_input: oam_net_name
         port_pd01_port_network_role_tag:
         - oam
         compute_pd_server_user_data_format:
@@ -251,21 +251,27 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pd01_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
         compute_ps_server_name:
         - get_input:
           - ps_server_names
           - 0
-        vm_image_name:
-          get_input: pd_image_name
         compute_ps_server_availability_zone:
         - get_input: availabilityzone_name
         compute_ps_server_user_data_format:
         - RAW
         compute_ps_server_scheduler_hints:
         - group: BE_Affinity_group
+        vm_flavor_name:
+          get_attribute:
+          - network_policy_server
+          - name
+        port_pd01_port_security_groups:
+        - - jsa_security_group
+        port_pd01_port_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
         port_pd01_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -276,12 +282,6 @@ topology_template:
         - get_attribute:
           - network_policy_server
           - name
-        vm_flavor_name:
-          get_attribute:
-          - network_policy_server
-          - name
-        port_pd01_port_security_groups:
-        - - jsa_security_group
         service_template_filter:
           substitute_service_template: Nested_ps_serverServiceTemplate.yaml
           count: 1
@@ -300,6 +300,12 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_attribute:
+          - network_policy_server
+          - name
+        port_pd01_port_security_groups:
+        - - jsa_security_group
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -315,18 +321,12 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
-        vm_flavor_name:
-          get_attribute:
-          - network_policy_server
-          - name
         compute_oam_server_user_data_format:
         - RAW
         compute_oam_server_name:
         - get_input:
           - oam_server_names
           - 0
-        port_pd01_port_security_groups:
-        - - jsa_security_group
         port_pd01_port_network_role_tag:
         - oam
         compute_oam_server_scheduler_hints:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
index e9f9aee10e..4e1b24e7f0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
@@ -11,6 +11,26 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_pd01_port_security_groups:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -34,16 +54,16 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    vm_flavor_name:
-      type: string
+    port_pd01_port_order:
+      type: list
       required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_oam_server_user_data_format:
       type: list
       required: true
@@ -54,16 +74,21 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_security_groups:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_oam_server_scheduler_hints:
       type: list
       required: true
@@ -77,6 +102,14 @@ topology_template:
           get_input:
           - port_pd01_port_security_groups
           - index_value
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -89,6 +122,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
index c79dd4cc64..1356fb8878 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,12 +11,42 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pd01_port_mac_requirements:
+    compute_pd_server_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_pd_server_scheduler_hints:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_pd01_port_security_groups:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_mac_requirements:
       type: list
       required: true
       entry_schema:
@@ -34,36 +64,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_pd_server_name:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
-      required: true
-    port_pd01_port_security_groups:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -100,6 +125,14 @@ topology_template:
           get_input:
           - port_pd01_port_security_groups
           - index_value
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -112,6 +145,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
index b2c48a9534..f408bad2cc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
@@ -11,19 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pd01_port_mac_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
     compute_ps_server_name:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
     compute_ps_server_availability_zone:
       type: list
       required: true
@@ -39,16 +31,6 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_pd01_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
-    port_pd01_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -56,6 +38,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     vm_flavor_name:
       type: string
       required: true
@@ -64,6 +51,49 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd01_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_pd01_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
   node_templates:
     ps_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -72,14 +102,38 @@ topology_template:
           get_input:
           - port_pd01_port_security_groups
           - index_value
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d4a4f2e671..85ccd9d77a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +60,36 @@ node_types:
         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_pd_server_availability_zone:
+      port_pd01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_name:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -405,6 +435,24 @@ node_types:
   org.openecomp.resource.abstract.nodes.oam_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -433,18 +481,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      vm_flavor_name:
-        type: string
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_oam_server_user_data_format:
         type: list
         required: true
@@ -457,12 +505,24 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
     requirements:
     - dependency_oam_server_pd01_port:
         capability: tosca.capabilities.Node
@@ -802,34 +862,52 @@ node_types:
   org.openecomp.resource.abstract.nodes.ps_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pd01_port_mac_requirements:
+      compute_ps_server_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      compute_ps_server_name:
+          type: string
+      compute_ps_server_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
+      compute_ps_server_user_data_format:
+        type: list
         required: true
         status: SUPPORTED
-      compute_ps_server_availability_zone:
+        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_pd01_port_exCP_naming:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_ps_server_user_data_format:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: json
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_ip_requirements:
         type: list
         required: true
@@ -842,18 +920,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      vm_flavor_name:
-        type: string
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
     requirements:
     - dependency_ps_server_pd01_port:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
index 1e96f5cadd..4a0ccad45d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
@@ -175,6 +175,16 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 0
+        vm_flavor_name:
+          get_attribute:
+          - network_policy_server
+          - name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -188,16 +198,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_attribute:
-          - network_policy_server
-          - name
         port_pd01_port_network_role_tag:
         - oam
         compute_pd_server_user_data_format:
@@ -215,19 +215,23 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pd01_port_mac_requirements:
-        - mac_count_required:
-            is_required: false
         compute_ps_server_name:
         - get_input:
           - ps_server_names
           - 0
-        vm_image_name:
-          get_input: pd_image_name
         compute_ps_server_availability_zone:
         - get_input: availabilityzone_name
         compute_ps_server_user_data_format:
         - RAW
+        vm_flavor_name:
+          get_attribute:
+          - network_policy_server
+          - name
+        port_pd01_port_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
         port_pd01_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
@@ -238,10 +242,6 @@ topology_template:
         - get_attribute:
           - network_policy_server
           - name
-        vm_flavor_name:
-          get_attribute:
-          - network_policy_server
-          - name
         service_template_filter:
           substitute_service_template: Nested_ps_serverServiceTemplate.yaml
           count: 1
@@ -255,6 +255,10 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_attribute:
+          - network_policy_server
+          - name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -270,10 +274,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
-        vm_flavor_name:
-          get_attribute:
-          - network_policy_server
-          - name
         compute_oam_server_user_data_format:
         - RAW
         compute_oam_server_name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
index 999882d584..9a034c3803 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
@@ -11,6 +11,21 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -34,16 +49,16 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    vm_flavor_name:
-      type: string
+    port_pd01_port_order:
+      type: list
       required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_oam_server_user_data_format:
       type: list
       required: true
@@ -54,15 +69,33 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
   node_templates:
     oam_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -75,6 +108,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
index 74044a11c2..dd358a5dd2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_pd_server_name:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role:
+      type: list
       required: true
+      entry_schema:
+        type: string
     port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,6 +107,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -94,6 +127,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
index 9b747c547e..8ccfbad0a7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
@@ -11,19 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pd01_port_mac_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
     compute_ps_server_name:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
     compute_ps_server_availability_zone:
       type: list
       required: true
@@ -34,6 +26,29 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_pd01_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
     port_pd01_port_ip_requirements:
       type: list
       required: true
@@ -44,28 +59,67 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    vm_flavor_name:
-      type: string
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
   node_templates:
     ps_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1bf05aa17e..13e08cc899 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -24,30 +54,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role_tag:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -393,6 +429,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -409,30 +475,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role_tag:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -778,6 +850,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -800,36 +902,36 @@ node_types:
         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_pd_server_availability_zone:
+      port_pd01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_name:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
index 3fab6b6130..6eec7d894d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
@@ -190,6 +190,14 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 2
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -203,14 +211,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 2
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_pd01_port_network_role_tag:
         - oam
         compute_pd_server_user_data_format:
@@ -233,6 +233,14 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -244,14 +252,6 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
@@ -267,6 +267,14 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -278,14 +286,6 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml
index a0614d3393..2ca7b3c25f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -24,26 +49,31 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -72,14 +102,38 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_attribute:
           - pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
index c32b489666..445fc6df88 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -24,26 +49,31 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -72,14 +102,38 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_attribute:
           - pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
index 1b487934d1..08e5895c0e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_pd_server_name:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role:
+      type: list
       required: true
+      entry_schema:
+        type: string
     port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,6 +107,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -94,6 +127,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 4f96bcd484..c5923cc46b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_0:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +60,36 @@ node_types:
         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_pd_server_availability_zone:
+      port_pd01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_name:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -405,6 +435,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -427,30 +487,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -796,6 +862,24 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server_2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pd01_port_2_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_3_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_3_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -804,6 +888,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_pd01_port_2_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -844,22 +934,52 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_2_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_2_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_3_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_2_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_3_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_2_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_2_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_pd01_port_3_network_role_tag:
         type: list
         required: true
@@ -878,6 +998,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_pd01_port_3_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
index 393fbdc37a..873c04ebec 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
@@ -233,6 +233,16 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        vm_flavor_name:
+          get_attribute:
+          - network_policy_server
+          - name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -246,16 +256,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        vm_flavor_name:
-          get_attribute:
-          - network_policy_server
-          - name
         port_pd01_port_network_role_tag:
         - oam
         compute_pd_server_user_data_format:
@@ -273,6 +273,16 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 0
+        vm_flavor_name:
+          get_attribute:
+          - network_policy_server
+          - name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -288,16 +298,6 @@ topology_template:
         - get_attribute:
           - network_policy_server
           - name
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_attribute:
-          - network_policy_server
-          - name
         compute_pd_server_user_data_format:
         - RAW
         service_template_filter:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml
index b6c4036c6d..6a96d70747 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_pd_server_name:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role:
+      type: list
       required: true
+      entry_schema:
+        type: string
     port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,6 +107,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -94,6 +127,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
index a0da89fcd1..1efd8dcca0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,26 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -77,14 +107,38 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
index f9becc9b4a..fd95fdc3fe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -11,6 +11,21 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pd01_port_2_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_3_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_3_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -18,6 +33,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_pd01_port_2_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -51,19 +71,44 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_2_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_2_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     vm_image_name:
       type: string
       required: true
+    port_pd01_port_3_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_2_network:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_3_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_2_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
+    port_pd01_port_2_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_pd01_port_3_network_role_tag:
       type: list
       required: true
@@ -79,6 +124,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_pd01_port_3_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.nodes.heat.pd_server
@@ -102,6 +152,14 @@ topology_template:
     pd_server_pd01_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_2_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_2_ip_requirements
@@ -114,6 +172,18 @@ topology_template:
           get_input:
           - port_pd01_port_2_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_2_network
@@ -126,6 +196,14 @@ topology_template:
     pd_server_pd01_port_3:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_3_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_3_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_3_ip_requirements
@@ -138,6 +216,18 @@ topology_template:
           get_input:
           - port_pd01_port_3_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_3_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_3_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_3_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_3_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 63f9c558e7..fb56d43c41 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +60,36 @@ node_types:
         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_pd_server_availability_zone:
+      port_pd01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_name:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -417,10 +447,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
+      port_ps01_port_subnetpoolid:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_ps_server_availability_zone:
         type: list
         required: true
@@ -441,22 +473,44 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_ps01_port_mac_requirements:
+      port_ps01_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_ps01_port_network:
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_ps01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
+          type: integer
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
+      port_ps01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_ps01_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_ps01_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_ps01_port_ip_requirements:
         type: list
         required: true
@@ -469,6 +523,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_ps01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
     attributes:
       ps_server_accessIPv4:
         type: list
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
index 2848946b96..f8c0769307 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
@@ -355,6 +355,14 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -370,14 +378,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_pd01_port_network_role_tag:
         - oam
         compute_pd_server_user_data_format:
@@ -399,21 +399,21 @@ topology_template:
         - get_input:
           - ps_server_names
           - 0
-        vm_image_name:
-          get_attribute:
-          - abstract_pd_server
-          - pd_server_accessIPv4
         compute_ps_server_availability_zone:
         - get_input: availabilityzone_name
         compute_ps_server_user_data_format:
         - RAW
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_attribute:
+          - abstract_pd_server
+          - pd_server_accessIPv4
         port_ps01_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_ps01_port_network:
         - get_input: oam_net_name
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_ps01_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
index 245fee1136..ad0a81d4dc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_pd_server_name:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role:
+      type: list
       required: true
+      entry_schema:
+        type: string
     port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,6 +107,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -94,6 +127,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
index f889b1a55b..d92309c5c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
@@ -16,9 +16,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
+    port_ps01_port_subnetpoolid:
+      type: list
       required: true
+      entry_schema:
+        type: string
     compute_ps_server_availability_zone:
       type: list
       required: true
@@ -36,6 +38,27 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_ps01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_ps01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    vm_image_name:
+      type: string
+      required: true
+    port_ps01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_ps01_port_mac_requirements:
       type: list
       required: true
@@ -46,9 +69,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
-      required: true
     port_ps01_port_ip_requirements:
       type: list
       required: true
@@ -59,6 +79,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_ps01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
   node_templates:
     ps_server:
       type: org.openecomp.resource.vfc.nodes.heat.ps_server
@@ -82,6 +107,14 @@ topology_template:
     ps_server_ps01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_ps01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_ps01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_ps01_port_ip_requirements
@@ -94,6 +127,18 @@ topology_template:
           get_input:
           - port_ps01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_ps01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_ps01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_ps01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_ps01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a674d6bf46..2ef83fec70 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,36 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +60,36 @@ node_types:
         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_pd_server_availability_zone:
+      port_pd01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_name:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_network_role:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
@@ -411,10 +441,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
+      port_ps01_port_subnetpoolid:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       compute_ps_server_availability_zone:
         type: list
         required: true
@@ -435,22 +467,44 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_ps01_port_mac_requirements:
+      port_ps01_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_ps01_port_network:
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_ps01_port_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
+          type: integer
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
+      port_ps01_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_ps01_port_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_ps01_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       port_ps01_port_ip_requirements:
         type: list
         required: true
@@ -463,6 +517,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_ps01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
     requirements:
     - dependency_ps_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
index bbbd7dadd3..645929f408 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
@@ -355,6 +355,14 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -368,14 +376,6 @@ topology_template:
               is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_pd01_port_network_role_tag:
         - oam
         compute_pd_server_user_data_format:
@@ -397,19 +397,19 @@ topology_template:
         - get_input:
           - ps_server_names
           - 0
-        vm_image_name:
-          get_input: pd_image_name
         compute_ps_server_availability_zone:
         - get_input: availabilityzone_name
         compute_ps_server_user_data_format:
         - RAW
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        vm_image_name:
+          get_input: pd_image_name
         port_ps01_port_mac_requirements:
         - mac_count_required:
             is_required: false
         port_ps01_port_network:
         - get_input: oam_net_name
-        vm_flavor_name:
-          get_input: pd_flavor_name
         port_ps01_port_ip_requirements:
         - - ip_version: 4
             ip_count_required:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
index 74044a11c2..dd358a5dd2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,31 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    compute_pd_server_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +54,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    compute_pd_server_name:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_network_role:
+      type: list
       required: true
+      entry_schema:
+        type: string
     port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,6 +107,14 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -94,6 +127,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
index 5baa4a45ff..c16b51c98d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
@@ -16,9 +16,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
+    port_ps01_port_subnetpoolid:
+      type: list
       required: true
+      entry_schema:
+        type: string
     compute_ps_server_availability_zone:
       type: list
       required: true
@@ -36,6 +38,27 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_ps01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_ps01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    vm_image_name:
+      type: string
+      required: true
+    port_ps01_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_ps01_port_mac_requirements:
       type: list
       required: true
@@ -46,9 +69,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
-      required: true
     port_ps01_port_ip_requirements:
       type: list
       required: true
@@ -59,6 +79,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_ps01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
   node_templates:
     ps_server:
       type: org.openecomp.resource.vfc.nodes.heat.ps_server
@@ -82,6 +107,14 @@ topology_template:
     ps_server_ps01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_ps01_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_ps01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_ps01_port_ip_requirements
@@ -94,6 +127,18 @@ topology_template:
           get_input:
           - port_ps01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_ps01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_ps01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_ps01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_ps01_port_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml
index 5d5f46e5fe..ec7134b1e0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml
@@ -326,7 +326,6 @@ topology_template:
           - sub_interface_vlan_tag
           - mac
           - port_tuple_refs
-          - virtual_machine_intefrace_mac_addresses
           - ip_prefix
           - address_mode
           - mac_address
@@ -337,6 +336,7 @@ topology_template:
           - virtual_network_refs
           - virtual_machine_interface_properties
           - virtual_machine_interface_allowed_address_pairs
+          - virtual_machine_interface_mac_addresses
   groups:
     ep-jsa_net_group:
       type: org.openecomp.groups.heat.HeatStack
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml
index aae1455919..758276fe18 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml
@@ -62,7 +62,7 @@ parameters:
   vnf_id:
     type: string
 resources:
-  QRouter:
+  QRouter1:
     properties:
       availability_zone:
         get_param: availability_zone_0
@@ -178,7 +178,7 @@ resources:
   qrouter_volume_0_att:
     properties:
       instance_uuid:
-        get_resource: QRouter
+        get_resource: QRouter1
       volume_id:
         get_resource: qrouter_volume_0
     type: OS::Cinder::VolumeAttachment
@@ -194,7 +194,7 @@ resources:
   qrouter_volume_1_att:
     properties:
       instance_uuid:
-        get_resource: QRouter
+        get_resource: QRouter1
       volume_id:
         get_resource: qrouter_volume_1
     type: OS::Cinder::VolumeAttachment
@@ -210,7 +210,7 @@ resources:
   qrouter_volume_2_att:
     properties:
       instance_uuid:
-        get_resource: QRouter
+        get_resource: QRouter1
       volume_id:
         get_resource: qrouter_volume_2
     type: OS::Cinder::VolumeAttachment
\ 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/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEBase_Module.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEBase_Module.yaml
index 5d0a5457ca..331737e599 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEBase_Module.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEBase_Module.yaml
@@ -269,7 +269,7 @@ parameters:
     description: Windows servers' domain
     type: string
 resources:
-  QRouter:
+  QRouter0:
     depends_on:
     - security_group
     - packet_mirror_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
index ce5bddcbb4..ca861cbfc0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
@@ -134,7 +134,52 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    QRouter:
+    qrouter_volume_1:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: qrouter_volume_type_1
+        size: '(get_input : qrouter_volume_size_1) * 1024'
+        description:
+          get_input: qrouter_volume_name_1
+    qrouter_volume_0:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: qrouter_volume_type_0
+        size: '(get_input : qrouter_volume_size_0) * 1024'
+        description:
+          get_input: qrouter_volume_name_0
+    cdr_network_port:
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        security_groups:
+        - get_input: security_group
+        mac_requirements:
+          mac_count_required:
+            is_required: false
+        network:
+          get_input: cdr_network
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: QRouter1
+          relationship: tosca.relationships.network.BindsTo
+    qrouter_volume_2:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        volume_type:
+          get_input: qrouter_volume_type_2
+        size: '(get_input : qrouter_volume_size_2) * 1024'
+        description:
+          get_input: qrouter_volume_name_2
+    QRouter1:
       type: org.openecomp.resource.vfc.nodes.heat.qrouter
       properties:
         flavor:
@@ -230,51 +275,6 @@ topology_template:
         register_status:
           type: tosca.artifacts.Deployment
           file: ../Artifacts/register_status.py
-    qrouter_volume_1:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: qrouter_volume_type_1
-        size: '(get_input : qrouter_volume_size_1) * 1024'
-        description:
-          get_input: qrouter_volume_name_1
-    qrouter_volume_0:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: qrouter_volume_type_0
-        size: '(get_input : qrouter_volume_size_0) * 1024'
-        description:
-          get_input: qrouter_volume_name_0
-    cdr_network_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        security_groups:
-        - get_input: security_group
-        mac_requirements:
-          mac_count_required:
-            is_required: false
-        network:
-          get_input: cdr_network
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: QRouter
-          relationship: tosca.relationships.network.BindsTo
-    qrouter_volume_2:
-      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
-      properties:
-        volume_type:
-          get_input: qrouter_volume_type_2
-        size: '(get_input : qrouter_volume_size_2) * 1024'
-        description:
-          get_input: qrouter_volume_name_2
     oam_private_net_network_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
@@ -295,78 +295,66 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: QRouter
+          node: QRouter1
           relationship: tosca.relationships.network.BindsTo
   relationship_templates:
     qrouter_volume_0_att:
       type: org.openecomp.relationships.VolumeAttachesTo
       properties:
         volume_id: qrouter_volume_0
-        instance_uuid: QRouter
+        instance_uuid: QRouter1
     qrouter_volume_2_att:
       type: org.openecomp.relationships.VolumeAttachesTo
       properties:
         volume_id: qrouter_volume_2
-        instance_uuid: QRouter
+        instance_uuid: QRouter1
     qrouter_volume_1_att:
       type: org.openecomp.relationships.VolumeAttachesTo
       properties:
         volume_id: qrouter_volume_1
-        instance_uuid: QRouter
+        instance_uuid: QRouter1
   groups:
     FEAdd_On_Module_QRouterTemplate_group:
       type: org.openecomp.groups.heat.HeatStack
       properties:
         heat_file: ../Artifacts/FEAdd_On_Module_QRouterTemplate.yaml
       members:
-      - QRouter
       - qrouter_volume_1
       - qrouter_volume_0
       - cdr_network_port
       - qrouter_volume_2
+      - QRouter1
       - oam_private_net_network_port
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_QRouterTemplate
     capabilities:
-      disk.usage_QRouter:
-      - QRouter
-      - disk.usage
       network.outgoing.bytes_cdr_network_port:
       - cdr_network_port
       - network.outgoing.bytes
-      disk.write.bytes_QRouter:
-      - QRouter
-      - disk.write.bytes
+      binding_QRouter1:
+      - QRouter1
+      - binding
       attachment_oam_private_net_network_port:
       - oam_private_net_network_port
       - attachment
       feature_qrouter_volume_1:
       - qrouter_volume_1
       - feature
-      disk.device.write.bytes_QRouter:
-      - QRouter
-      - disk.device.write.bytes
       feature_qrouter_volume_2:
       - qrouter_volume_2
       - feature
-      endpoint_QRouter:
-      - QRouter
-      - endpoint
       feature_qrouter_volume_0:
       - qrouter_volume_0
       - feature
       attachment_qrouter_volume_2:
       - qrouter_volume_2
       - attachment
-      disk.capacity_QRouter:
-      - QRouter
-      - disk.capacity
+      cpu_util_QRouter1:
+      - QRouter1
+      - cpu_util
       attachment_qrouter_volume_0:
       - qrouter_volume_0
       - attachment
-      disk.read.bytes.rate_QRouter:
-      - QRouter
-      - disk.read.bytes.rate
       attachment_qrouter_volume_1:
       - qrouter_volume_1
       - attachment
@@ -376,172 +364,181 @@ topology_template:
       network.incoming.packets_cdr_network_port:
       - cdr_network_port
       - network.incoming.packets
+      disk.device.read.bytes.rate_QRouter1:
+      - QRouter1
+      - disk.device.read.bytes.rate
       network.outgoing.bytes.rate_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.outgoing.bytes.rate
-      instance_QRouter:
-      - QRouter
-      - instance
-      disk.device.latency_QRouter:
-      - QRouter
-      - disk.device.latency
-      disk.device.usage_QRouter:
-      - QRouter
-      - disk.device.usage
-      disk.ephemeral.size_QRouter:
-      - QRouter
-      - disk.ephemeral.size
-      disk.device.iops_QRouter:
-      - QRouter
-      - disk.device.iops
+      disk.device.read.bytes_QRouter1:
+      - QRouter1
+      - disk.device.read.bytes
       network.outpoing.packets_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.outpoing.packets
       network.outpoing.packets_cdr_network_port:
       - cdr_network_port
       - network.outpoing.packets
-      disk.device.read.bytes_QRouter:
-      - QRouter
-      - disk.device.read.bytes
-      disk.iops_QRouter:
-      - QRouter
-      - disk.iops
+      memory.resident_QRouter1:
+      - QRouter1
+      - memory.resident
+      disk.device.latency_QRouter1:
+      - QRouter1
+      - disk.device.latency
+      host_QRouter1:
+      - QRouter1
+      - host
       feature_cdr_network_port:
       - cdr_network_port
       - feature
-      disk.device.read.requests.rate_QRouter:
-      - QRouter
-      - disk.device.read.requests.rate
-      disk.read.bytes_QRouter:
-      - QRouter
-      - disk.read.bytes
-      memory.resident_QRouter:
-      - QRouter
-      - memory.resident
-      host_QRouter:
-      - QRouter
-      - host
+      disk.device.write.bytes.rate_QRouter1:
+      - QRouter1
+      - disk.device.write.bytes.rate
+      disk.device.usage_QRouter1:
+      - QRouter1
+      - disk.device.usage
       network.incoming.bytes_cdr_network_port:
       - cdr_network_port
       - network.incoming.bytes
-      memory_QRouter:
-      - QRouter
-      - memory
-      disk.device.read.requests_QRouter:
-      - QRouter
-      - disk.device.read.requests
-      scalable_QRouter:
-      - QRouter
-      - scalable
-      os_QRouter:
-      - QRouter
-      - os
+      instance_QRouter1:
+      - QRouter1
+      - instance
+      disk.root.size_QRouter1:
+      - QRouter1
+      - disk.root.size
+      vcpus_QRouter1:
+      - QRouter1
+      - vcpus
       network.incoming.bytes_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.incoming.bytes
-      disk.write.bytes.rate_QRouter:
-      - QRouter
-      - disk.write.bytes.rate
       feature_oam_private_net_network_port:
       - oam_private_net_network_port
       - feature
-      cpu_util_QRouter:
-      - QRouter
-      - cpu_util
+      cpu.delta_QRouter1:
+      - QRouter1
+      - cpu.delta
+      disk.capacity_QRouter1:
+      - QRouter1
+      - disk.capacity
+      memory.usage_QRouter1:
+      - QRouter1
+      - memory.usage
+      disk.write.requests.rate_QRouter1:
+      - QRouter1
+      - disk.write.requests.rate
+      disk.read.requests_QRouter1:
+      - QRouter1
+      - disk.read.requests
+      feature_QRouter1:
+      - QRouter1
+      - feature
       network.incoming.bytes.rate_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.incoming.bytes.rate
-      disk.device.write.requests_QRouter:
-      - QRouter
-      - disk.device.write.requests
-      disk.device.read.bytes.rate_QRouter:
-      - QRouter
-      - disk.device.read.bytes.rate
+      disk.ephemeral.size_QRouter1:
+      - QRouter1
+      - disk.ephemeral.size
+      disk.latency_QRouter1:
+      - QRouter1
+      - disk.latency
+      disk.device.capacity_QRouter1:
+      - QRouter1
+      - disk.device.capacity
       network.incoming.bytes.rate_cdr_network_port:
       - cdr_network_port
       - network.incoming.bytes.rate
-      disk.device.allocation_QRouter:
-      - QRouter
-      - disk.device.allocation
       network.outgoing.bytes_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.outgoing.bytes
-      disk.device.capacity_QRouter:
-      - QRouter
-      - disk.device.capacity
-      feature_QRouter:
-      - QRouter
-      - feature
-      disk.read.requests_QRouter:
-      - QRouter
-      - disk.read.requests
-      disk.device.write.bytes.rate_QRouter:
-      - QRouter
-      - disk.device.write.bytes.rate
-      disk.write.requests_QRouter:
-      - QRouter
-      - disk.write.requests
-      disk.root.size_QRouter:
-      - QRouter
-      - disk.root.size
-      memory.usage_QRouter:
-      - QRouter
-      - memory.usage
+      disk.iops_QRouter1:
+      - QRouter1
+      - disk.iops
+      disk.device.write.requests_QRouter1:
+      - QRouter1
+      - disk.device.write.requests
+      disk.device.write.requests.rate_QRouter1:
+      - QRouter1
+      - disk.device.write.requests.rate
+      disk.device.allocation_QRouter1:
+      - QRouter1
+      - disk.device.allocation
+      memory_QRouter1:
+      - QRouter1
+      - memory
+      disk.usage_QRouter1:
+      - QRouter1
+      - disk.usage
+      scalable_QRouter1:
+      - QRouter1
+      - scalable
       network.outgoing.bytes.rate_cdr_network_port:
       - cdr_network_port
       - network.outgoing.bytes.rate
       binding_oam_private_net_network_port:
       - oam_private_net_network_port
       - binding
-      cpu_QRouter:
-      - QRouter
-      - cpu
-      vcpus_QRouter:
-      - QRouter
-      - vcpus
-      disk.allocation_QRouter:
-      - QRouter
-      - disk.allocation
       network.incoming.packets.rate_cdr_network_port:
       - cdr_network_port
       - network.incoming.packets.rate
+      disk.write.bytes_QRouter1:
+      - QRouter1
+      - disk.write.bytes
+      disk.write.requests_QRouter1:
+      - QRouter1
+      - disk.write.requests
       network.incoming.packets_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.incoming.packets
+      cpu_QRouter1:
+      - QRouter1
+      - cpu
+      os_QRouter1:
+      - QRouter1
+      - os
+      disk.device.read.requests.rate_QRouter1:
+      - QRouter1
+      - disk.device.read.requests.rate
       network.incoming.packets.rate_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.incoming.packets.rate
-      disk.device.write.requests.rate_QRouter:
-      - QRouter
-      - disk.device.write.requests.rate
-      cpu.delta_QRouter:
-      - QRouter
-      - cpu.delta
-      binding_QRouter:
-      - QRouter
-      - binding
+      disk.read.bytes_QRouter1:
+      - QRouter1
+      - disk.read.bytes
       binding_cdr_network_port:
       - cdr_network_port
       - binding
+      disk.write.bytes.rate_QRouter1:
+      - QRouter1
+      - disk.write.bytes.rate
+      disk.device.write.bytes_QRouter1:
+      - QRouter1
+      - disk.device.write.bytes
       network.outgoing.packets.rate_cdr_network_port:
       - cdr_network_port
       - network.outgoing.packets.rate
-      disk.latency_QRouter:
-      - QRouter
-      - disk.latency
-      disk.write.requests.rate_QRouter:
-      - QRouter
-      - disk.write.requests.rate
+      disk.device.iops_QRouter1:
+      - QRouter1
+      - disk.device.iops
+      disk.read.bytes.rate_QRouter1:
+      - QRouter1
+      - disk.read.bytes.rate
+      endpoint_QRouter1:
+      - QRouter1
+      - endpoint
+      disk.allocation_QRouter1:
+      - QRouter1
+      - disk.allocation
+      disk.device.read.requests_QRouter1:
+      - QRouter1
+      - disk.device.read.requests
       network.outgoing.packets.rate_oam_private_net_network_port:
       - oam_private_net_network_port
       - network.outgoing.packets.rate
     requirements:
-      local_storage_QRouter:
-      - QRouter
+      local_storage_QRouter1:
+      - QRouter1
       - local_storage
-      dependency_QRouter:
-      - QRouter
-      - dependency
       dependency_qrouter_volume_1:
       - qrouter_volume_1
       - dependency
@@ -562,4 +559,7 @@ topology_template:
       - dependency
       link_cdr_network_port:
       - cdr_network_port
-      - link
\ No newline at end of file
+      - link
+      dependency_QRouter1:
+      - QRouter1
+      - dependency
\ 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/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 4d7aa4f012..86de04a96c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -131,20 +131,6 @@ node_types:
         required: true
         status: SUPPORTED
     requirements:
-    - dependency_QRouter:
-        capability: tosca.capabilities.Node
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.DependsOn
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - local_storage_QRouter:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.BlockStorage
-        relationship: tosca.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
     - dependency_qrouter_volume_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -179,6 +165,20 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+    - dependency_QRouter1:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - local_storage_QRouter1:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
     - dependency_oam_private_net_network_port:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
@@ -193,21 +193,14 @@ node_types:
         - 1
         - 1
     capabilities:
-      disk.usage_QRouter:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       network.outgoing.bytes_cdr_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_QRouter:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_QRouter1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
@@ -221,22 +214,11 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_QRouter:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_qrouter_volume_2:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_QRouter:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
       feature_qrouter_volume_0:
         type: tosca.capabilities.Node
         occurrences:
@@ -247,7 +229,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_QRouter:
+      cpu_util_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -258,12 +240,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes.rate_QRouter:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
-        occurrences:
-        - 1
-        - UNBOUNDED
       attachment_qrouter_volume_1:
         type: tosca.capabilities.Attachment
         occurrences:
@@ -280,160 +256,161 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_oam_private_net_network_port:
+      disk.device.read.bytes.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_QRouter:
+      network.outgoing.bytes.rate_oam_private_net_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_QRouter:
+      disk.device.read.bytes_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_QRouter:
+      network.outpoing.packets_oam_private_net_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_QRouter:
+      network.outpoing.packets_cdr_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_QRouter:
+      memory.resident_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_oam_private_net_network_port:
+      disk.device.latency_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cdr_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_QRouter1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_QRouter:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cdr_network_port:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_QRouter:
+      disk.device.write.bytes.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cdr_network_port:
-        type: tosca.capabilities.Node
+      disk.device.usage_QRouter1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_QRouter:
+      network.incoming.bytes_cdr_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_QRouter:
+      instance_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_QRouter:
+      disk.root.size_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_QRouter:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      vcpus_QRouter1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cdr_network_port:
+      network.incoming.bytes_oam_private_net_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_QRouter:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_oam_private_net_network_port:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_QRouter:
+      cpu.delta_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_QRouter:
-        type: tosca.capabilities.Scalable
+      disk.capacity_QRouter1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_QRouter:
-        type: tosca.capabilities.OperatingSystem
+      memory.usage_QRouter1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_oam_private_net_network_port:
+      disk.write.requests.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_QRouter:
+      disk.read.requests_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_oam_private_net_network_port:
+      feature_QRouter1:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_QRouter:
+      network.incoming.bytes.rate_oam_private_net_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_oam_private_net_network_port:
+      disk.ephemeral.size_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_QRouter:
+      disk.latency_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_QRouter:
+      disk.device.capacity_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -445,56 +422,50 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_QRouter:
+      network.outgoing.bytes_oam_private_net_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_oam_private_net_network_port:
+      disk.iops_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_QRouter:
+      disk.device.write.requests_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_QRouter:
-        type: tosca.capabilities.Node
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.requests_QRouter:
+      disk.device.write.requests.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_QRouter:
+      disk.device.allocation_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_QRouter:
+      memory_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_QRouter:
+      disk.usage_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_QRouter:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_QRouter1:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
@@ -511,56 +482,56 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      cpu_QRouter:
+      network.incoming.packets.rate_cdr_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_QRouter:
+      disk.write.bytes_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_QRouter:
+      disk.write.requests_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cdr_network_port:
+      network.incoming.packets_oam_private_net_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_oam_private_net_network_port:
+      cpu_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_oam_private_net_network_port:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_QRouter1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_QRouter:
+      disk.device.read.requests.rate_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_QRouter:
+      network.incoming.packets.rate_oam_private_net_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_QRouter:
-        type: tosca.capabilities.network.Bindable
+      disk.read.bytes_QRouter1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
@@ -571,19 +542,48 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+      disk.write.bytes.rate_QRouter1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes_QRouter1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
       network.outgoing.packets.rate_cdr_network_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_QRouter:
+      disk.device.iops_QRouter1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes.rate_QRouter1:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+        occurrences:
+        - 1
+        - UNBOUNDED
+      endpoint_QRouter1:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.allocation_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_QRouter:
+      disk.device.read.requests_QRouter1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
index b6e1ec9cd6..7d2364e084 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
@@ -733,91 +733,6 @@ topology_template:
           capability: tosca.capabilities.Node
           node: packet_internal_network
           relationship: tosca.relationships.DependsOn
-    QRouter:
-      type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_QRouterTemplate
-      directives:
-      - substitutable
-      properties:
-        vf_module_id:
-          get_input: vf_module_id
-        qrouter_cluster_name:
-          get_input: qrouter_cluster_name
-        oam_private_net_name:
-          get_input: oam_private_net_name
-        qrouter_flavor_name:
-          get_input: qrouter_flavor_name
-        version_number:
-          get_input: version_number
-        vf_module_name:
-          get_input: vf_module_name
-        service_template_filter:
-          substitute_service_template: FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
-        domain_name:
-          get_input: domain_name
-        ntp_timezone:
-          get_input: ntp_timezone
-        vnf_id:
-          get_input: vnf_id
-        availability_zone_0:
-          get_input: availability_zone_0
-        region_name:
-          get_input: region_name
-        manager_name_0:
-          get_input: manager_name_0
-        qrouter_names:
-          get_input: qrouter_names
-        tenant_name:
-          get_input: tenant_name
-        security_group: security_group
-        cdr_network:
-          get_input: cdr_network
-        qrouter_image_name:
-          get_input: base_image_name
-        qrouter_volume_type_1:
-          get_input: qrouter_volume_type_1
-        qrouter_volume_type_2:
-          get_input: qrouter_volume_type_2
-        qrouter_node_count:
-          get_input: qrouter_node_count
-        qrouter_volume_name_2:
-          get_input: qrouter_volume_name_2
-        qrouter_volume_name_1:
-          get_input: qrouter_volume_name_1
-        qrouter_volume_name_0:
-          get_input: qrouter_volume_name_0
-        qrouter_volume_type_0:
-          get_input: qrouter_volume_type_0
-        qrouter_volume_size_0:
-          get_input: qrouter_volume_size_0
-        qrouter_volume_size_1:
-          get_input: qrouter_volume_size_1
-        manager_oam_direct_ip_0:
-          get_input: manager_oam_direct_ip_0
-        qrouter_volume_size_2:
-          get_input: qrouter_volume_size_2
-        rpmrepository_ip_0:
-          get_input: rpmrepository_ip_0
-      requirements:
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: security_group
-          relationship: tosca.relationships.DependsOn
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: packet_mirror_network
-          relationship: tosca.relationships.DependsOn
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: packet_mirror_network
-          relationship: tosca.relationships.DependsOn
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: packet_internal_network
-          relationship: tosca.relationships.DependsOn
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: packet_internal_network
-          relationship: tosca.relationships.DependsOn
     packet_mirror_network:
       type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
       properties:
@@ -915,11 +830,11 @@ topology_template:
       requirements:
       - port:
           capability: attachment_oam_private_net_network_port
-          node: QRouter
+          node: QRouter0
           relationship: org.openecomp.relationships.AttachesTo
       - port:
           capability: attachment_cdr_network_port
-          node: QRouter
+          node: QRouter0
           relationship: org.openecomp.relationships.AttachesTo
       - port:
           capability: attachment_oam_private_net_network_port
@@ -957,6 +872,91 @@ topology_template:
           capability: attachment_packet_internal_network_port
           node: vProbe
           relationship: org.openecomp.relationships.AttachesTo
+    QRouter0:
+      type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_QRouterTemplate
+      directives:
+      - substitutable
+      properties:
+        vf_module_id:
+          get_input: vf_module_id
+        qrouter_cluster_name:
+          get_input: qrouter_cluster_name
+        oam_private_net_name:
+          get_input: oam_private_net_name
+        qrouter_flavor_name:
+          get_input: qrouter_flavor_name
+        version_number:
+          get_input: version_number
+        vf_module_name:
+          get_input: vf_module_name
+        service_template_filter:
+          substitute_service_template: FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml
+        domain_name:
+          get_input: domain_name
+        ntp_timezone:
+          get_input: ntp_timezone
+        vnf_id:
+          get_input: vnf_id
+        availability_zone_0:
+          get_input: availability_zone_0
+        region_name:
+          get_input: region_name
+        manager_name_0:
+          get_input: manager_name_0
+        qrouter_names:
+          get_input: qrouter_names
+        tenant_name:
+          get_input: tenant_name
+        security_group: security_group
+        cdr_network:
+          get_input: cdr_network
+        qrouter_image_name:
+          get_input: base_image_name
+        qrouter_volume_type_1:
+          get_input: qrouter_volume_type_1
+        qrouter_volume_type_2:
+          get_input: qrouter_volume_type_2
+        qrouter_node_count:
+          get_input: qrouter_node_count
+        qrouter_volume_name_2:
+          get_input: qrouter_volume_name_2
+        qrouter_volume_name_1:
+          get_input: qrouter_volume_name_1
+        qrouter_volume_name_0:
+          get_input: qrouter_volume_name_0
+        qrouter_volume_type_0:
+          get_input: qrouter_volume_type_0
+        qrouter_volume_size_0:
+          get_input: qrouter_volume_size_0
+        qrouter_volume_size_1:
+          get_input: qrouter_volume_size_1
+        manager_oam_direct_ip_0:
+          get_input: manager_oam_direct_ip_0
+        qrouter_volume_size_2:
+          get_input: qrouter_volume_size_2
+        rpmrepository_ip_0:
+          get_input: rpmrepository_ip_0
+      requirements:
+      - dependency:
+          capability: tosca.capabilities.Node
+          node: security_group
+          relationship: tosca.relationships.DependsOn
+      - dependency:
+          capability: tosca.capabilities.Node
+          node: packet_mirror_network
+          relationship: tosca.relationships.DependsOn
+      - dependency:
+          capability: tosca.capabilities.Node
+          node: packet_mirror_network
+          relationship: tosca.relationships.DependsOn
+      - dependency:
+          capability: tosca.capabilities.Node
+          node: packet_internal_network
+          relationship: tosca.relationships.DependsOn
+      - dependency:
+          capability: tosca.capabilities.Node
+          node: packet_internal_network
+          relationship: tosca.relationships.DependsOn
     vLB:
       type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBTemplate
       directives:
@@ -1062,8 +1062,8 @@ topology_template:
       members:
       - vLBAgent
       - vProbe
-      - QRouter
       - packet_mirror_network
       - packet_internal_network
       - security_group
+      - QRouter0
       - vLB
\ 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/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 9159c8b742..13cccd38b7 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
@@ -14,12 +14,166 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB_OAM_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       compute_FSB1_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
+      port_FSB2_Internal2_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB_OAM_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal2_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal2_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal1_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal1_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal1_mac_address:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB_OAM_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal1_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal2_mac_address:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal2_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB_OAM_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal2_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB_OAM_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_FSB1_availability_zone:
         type: list
         required: true
@@ -40,47 +194,85 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_FSB_OAM_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       port_FSB2_Internal2_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_FSB2_Internal2_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB2_Internal1_mac_address:
+        entry_schema:
+          type: json
+      port_FSB2_Internal1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB2_Internal2_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB1_Internal_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB2_Internal1_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal1_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_FSB_OAM_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      compute_FSB1_name:
+      port_FSB2_Internal2_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_FSB_OAM_network:
+          type: integer
+      port_FSB2_Internal1_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal1_network:
+      port_FSB1_Internal_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_FSB2_Internal2_mac_address:
+          type: json
+      port_FSB_OAM_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      compute_FSB1_name:
         type: list
         required: true
         status: SUPPORTED
@@ -655,4 +847,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ 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/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
index 3fd981df0e..ac5e7b1360 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
@@ -16,11 +16,139 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB_OAM_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_FSB1_metadata:
       type: list
       required: true
       entry_schema:
         type: json
+    port_FSB2_Internal2_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal2_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal2_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -38,40 +166,72 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_FSB_OAM_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     port_FSB2_Internal2_network:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_FSB2_Internal2_vlan_requirements:
+      type: list
       required: true
-    port_FSB2_Internal1_mac_address:
+      entry_schema:
+        type: json
+    port_FSB2_Internal1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB2_Internal2_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
+    port_FSB1_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB2_Internal1_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_FSB_OAM_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_FSB1_name:
+    port_FSB2_Internal2_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB_OAM_network:
+        type: integer
+    port_FSB2_Internal1_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal1_network:
+    port_FSB1_Internal_mac_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB2_Internal2_mac_address:
+        type: json
+    port_FSB_OAM_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    compute_FSB1_name:
       type: list
       required: true
       entry_schema:
@@ -80,6 +240,38 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB1_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB1_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB1_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB1_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB1_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB1_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB1_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB1_Internal_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB1_Internal_network
@@ -96,6 +288,38 @@ topology_template:
     FSB1_FSB_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB_OAM_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB_OAM_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB_OAM_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB_OAM_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB_OAM_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB_OAM_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB_OAM_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB_OAM_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_FSB_OAM_fixed_ips
@@ -112,6 +336,38 @@ topology_template:
     FSB1_FSB2_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal2_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB2_Internal2_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal2_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB2_Internal2_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal2_network
@@ -152,6 +408,38 @@ topology_template:
     FSB1_FSB2_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal1_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB2_Internal1_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal1_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB2_Internal1_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal1_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 916359eb88..78f448ce6f 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
@@ -295,4 +295,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ 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/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/SubstitutionServiceTemplate.yaml
index 7c322d53fd..96a3a66c4e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoPorts/out/SubstitutionServiceTemplate.yaml
@@ -193,4 +193,4 @@ topology_template:
       - dependency
       local_storage_FSB1:
       - FSB1
-      - local_storage
+      - local_storage
\ 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/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 d570a37afb..dda1f4295d 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
@@ -14,13 +14,119 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB_OAM_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       compute_FSB1_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_FSB_OAM_fixed_ips:
+      port_FSB2_Internal_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB2_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB_OAM_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB_OAM_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -46,29 +152,67 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_FSB2_Internal_network:
+      port_FSB_OAM_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB2_Internal_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_FSB1_name:
+      port_FSB2_Internal_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB_OAM_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_FSB1_Internal_mac_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_mac_address:
+        entry_schema:
+          type: json
+      port_FSB_OAM_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      compute_FSB1_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB_OAM_network:
+      port_FSB2_Internal_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
@@ -565,4 +709,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ 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/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
index 58ea943973..76dbaad388 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
@@ -16,12 +16,100 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB_OAM_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_FSB1_metadata:
       type: list
       required: true
       entry_schema:
         type: json
-    port_FSB_OAM_fixed_ips:
+    port_FSB2_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB2_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_mac_requirements:
       type: list
       required: true
       entry_schema:
@@ -43,25 +131,57 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_FSB2_Internal_network:
+    port_FSB_OAM_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB2_Internal_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_mac_address:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_FSB1_name:
+    port_FSB2_Internal_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB_OAM_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_network:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_FSB1_Internal_mac_requirements:
+      type: list
       required: true
-    port_FSB2_Internal_mac_address:
+      entry_schema:
+        type: json
+    port_FSB_OAM_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    compute_FSB1_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB_OAM_network:
+    port_FSB2_Internal_network_role_tag:
       type: list
       required: true
       entry_schema:
@@ -70,6 +190,38 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB1_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB1_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB1_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB1_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB1_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB1_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB1_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB1_Internal_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB1_Internal_network
@@ -86,6 +238,38 @@ topology_template:
     FSB1_FSB2_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB2_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB2_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal_network
@@ -102,6 +286,38 @@ topology_template:
     FSB1_FSB_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB_OAM_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB_OAM_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB_OAM_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB_OAM_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB_OAM_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB_OAM_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB_OAM_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB_OAM_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_FSB_OAM_fixed_ips
@@ -388,4 +604,4 @@ topology_template:
       - link
       dependency_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
-      - dependency
+      - dependency
\ 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/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 6183e8703e..e2581559d2 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
@@ -14,12 +14,82 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB1_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       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: json
+      port_FSB2_Internal_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB2_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       compute_FSB1_availability_zone:
         type: list
         required: true
@@ -40,23 +110,49 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_FSB2_Internal_network:
+      port_FSB2_Internal_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_FSB1_name:
+      port_FSB2_Internal_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB2_Internal_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_FSB1_Internal_mac_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_mac_address:
+        entry_schema:
+          type: json
+      compute_FSB1_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
@@ -516,4 +612,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ 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/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
index 07c6c2528b..adc80eaf7a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -16,11 +16,69 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB1_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_FSB1_metadata:
       type: list
       required: true
       entry_schema:
         type: json
+    port_FSB2_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB2_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB2_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -38,20 +96,42 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_FSB2_Internal_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     port_FSB2_Internal_network:
       type: list
       required: true
       entry_schema:
         type: string
+    port_FSB1_Internal_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_FSB1_name:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
-      required: true
-    port_FSB2_Internal_mac_address:
+    port_FSB2_Internal_network_role_tag:
       type: list
       required: true
       entry_schema:
@@ -60,6 +140,38 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB1_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB1_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB1_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB1_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB1_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB1_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB1_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB1_Internal_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB1_Internal_network
@@ -76,6 +188,38 @@ topology_template:
     FSB1_FSB2_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB2_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB2_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal_network
@@ -388,4 +532,4 @@ topology_template:
       - local_storage
       dependency_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
-      - dependency
+      - dependency
\ 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/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 bf0af32231..40048e44db 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
@@ -14,13 +14,119 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB_OAM_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       compute_FSB1_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: json
-      port_FSB_OAM_fixed_ips:
+      port_FSB2_Internal_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB2_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB_OAM_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB_OAM_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -46,29 +152,67 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_FSB2_Internal_network:
+      port_FSB_OAM_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB2_Internal_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_FSB1_name:
+      port_FSB2_Internal_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB_OAM_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_FSB1_Internal_mac_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_mac_address:
+        entry_schema:
+          type: json
+      port_FSB_OAM_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      compute_FSB1_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB_OAM_network:
+      port_FSB2_Internal_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
@@ -601,4 +745,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ 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/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
index b20af41093..4faca73a16 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -16,12 +16,100 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB_OAM_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_FSB1_metadata:
       type: list
       required: true
       entry_schema:
         type: json
-    port_FSB_OAM_fixed_ips:
+    port_FSB2_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB2_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_mac_requirements:
       type: list
       required: true
       entry_schema:
@@ -43,25 +131,57 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_FSB2_Internal_network:
+    port_FSB_OAM_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB2_Internal_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_mac_address:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_FSB1_name:
+    port_FSB2_Internal_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB_OAM_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_network:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_FSB1_Internal_mac_requirements:
+      type: list
       required: true
-    port_FSB2_Internal_mac_address:
+      entry_schema:
+        type: json
+    port_FSB_OAM_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    compute_FSB1_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB_OAM_network:
+    port_FSB2_Internal_network_role_tag:
       type: list
       required: true
       entry_schema:
@@ -70,6 +190,38 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB1_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB1_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB1_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB1_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB1_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB1_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB1_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB1_Internal_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB1_Internal_network
@@ -86,6 +238,38 @@ topology_template:
     FSB1_FSB2_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB2_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB2_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal_network
@@ -102,6 +286,38 @@ topology_template:
     FSB1_FSB_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB_OAM_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB_OAM_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB_OAM_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB_OAM_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB_OAM_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB_OAM_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB_OAM_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB_OAM_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_FSB_OAM_fixed_ips
@@ -445,4 +661,4 @@ topology_template:
       - link
       dependency_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
-      - dependency
+      - dependency
\ 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/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 6772f8c594..84bab83d19 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
@@ -14,12 +14,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB1_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       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: json
+      port_FSB2_Internal_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
       compute_FSB1_availability_zone:
         type: list
         required: true
@@ -34,23 +58,95 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_FSB2_Internal_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_mac_address:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB1_Internal_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       port_FSB2_Internal_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB2_Internal_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
       compute_FSB1_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_FSB1_Internal_exCP_naming:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_mac_address:
+        entry_schema:
+          type: json
+      port_FSB1_Internal_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
@@ -510,4 +606,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ 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/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
index 4c5d4ae924..cb7a4127a1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -16,11 +16,31 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB1_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_FSB1_metadata:
       type: list
       required: true
       entry_schema:
         type: json
+    port_FSB2_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -33,20 +53,80 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_FSB2_Internal_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB2_Internal_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_FSB2_Internal_network:
       type: list
       required: true
       entry_schema:
         type: string
+    port_FSB2_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_FSB1_name:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_FSB1_Internal_exCP_naming:
+      type: list
       required: true
-    port_FSB2_Internal_mac_address:
+      entry_schema:
+        type: json
+    port_FSB1_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal_network_role_tag:
       type: list
       required: true
       entry_schema:
@@ -55,6 +135,38 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB1_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB1_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB1_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB1_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB1_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB1_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB1_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB1_Internal_subnetpoolid
+          - index_value
         network:
           get_attribute:
           - FSB1_FSB2_Internal
@@ -71,6 +183,38 @@ topology_template:
     FSB1_FSB2_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB2_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB2_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal_subnetpoolid
+          - index_value
         device_id:
           get_attribute:
           - FSB1
@@ -387,4 +531,4 @@ topology_template:
       - local_storage
       dependency_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
-      - dependency
+      - dependency
\ 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/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 f1d1182772..b9a448541a 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
@@ -8,7 +8,113 @@ node_types:
   org.openecomp.resource.abstract.nodes.FSB1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_FSB_OAM_fixed_ips:
+      port_FSB_OAM_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB2_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB_OAM_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB_OAM_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB_OAM_mac_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -28,23 +134,61 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_FSB2_Internal_network:
+      port_FSB_OAM_order:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      vm_flavor_name:
-        type: string
+          type: integer
+      port_FSB2_Internal_mac_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       port_FSB2_Internal_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB_OAM_network:
+      port_FSB2_Internal_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB1_Internal_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_FSB_OAM_fixed_ips:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB1_Internal_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB_OAM_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
@@ -577,4 +721,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ 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/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
index 3ef8780d7e..6cd3625e82 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -11,7 +11,95 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_FSB_OAM_fixed_ips:
+    port_FSB_OAM_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB2_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_mac_requirements:
       type: list
       required: true
       entry_schema:
@@ -28,20 +116,52 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_FSB2_Internal_network:
+    port_FSB_OAM_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
+        type: integer
+    port_FSB2_Internal_mac_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     port_FSB2_Internal_mac_address:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB_OAM_network:
+    port_FSB2_Internal_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB1_Internal_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_FSB_OAM_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB1_Internal_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal_network_role_tag:
       type: list
       required: true
       entry_schema:
@@ -50,6 +170,38 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB1_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB1_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB1_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB1_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB1_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB1_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB1_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB1_Internal_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB1_Internal_network
@@ -66,6 +218,38 @@ topology_template:
     FSB1_FSB2_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB2_Internal_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB2_Internal_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal_network
@@ -82,6 +266,38 @@ topology_template:
     FSB1_FSB_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB_OAM_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB_OAM_vlan_requirements
+          - index_value
+        ip_requirements:
+          get_input:
+          - port_FSB_OAM_ip_requirements
+          - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB_OAM_network_role_tag
+          - index_value
+        mac_requirements:
+          get_input:
+          - port_FSB_OAM_mac_requirements
+          - index_value
+        order:
+          get_input:
+          - port_FSB_OAM_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB_OAM_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB_OAM_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_FSB_OAM_fixed_ips
@@ -420,4 +636,4 @@ topology_template:
       - link
       dependency_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
-      - dependency
+      - dependency
\ 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/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
index b441d659c0..ac134c31c5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
@@ -181,16 +181,18 @@ topology_template:
       properties:
         port_FSB1_Internal_mac_address:
         - get_input: fsb1-Internal1-mac
-        port_FSB1_Internal_network:
-        - Internal1-net
         vm_flavor_name:
           get_input: fsb-flavor
-        port_FSB2_Internal_mac_address:
-        - get_input: fsb1-Internal2-mac
         vm_image_name:
           get_input: fsb-image
         compute_FSB_admin_pass:
         - STATIC-DATA-FSB1
+        port_FSB_OAM_network:
+        - jsa_net1
+        port_FSB1_Internal_network:
+        - Internal1-net
+        port_FSB2_Internal_mac_address:
+        - get_input: fsb1-Internal2-mac
         port_FSB_OAM_fixed_ips:
         - - ip_address:
               get_input: fsb1-oam-ip
@@ -202,8 +204,6 @@ topology_template:
           - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
-        port_FSB_OAM_network:
-        - jsa_net1
         compute_FSB_name:
         - get_input: fsb1-name
         service_template_filter:
@@ -225,4 +225,4 @@ topology_template:
       - FSB2_Internal2
       - FSB1_Internal1
       - FSB1_OAM
-      - FSB1_template
+      - FSB1_template
\ 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/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
index e2adb3038b..8bb81bc2fa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
@@ -162,22 +162,22 @@ topology_template:
         - get_input: fsb1-Internal1-mac
         port_FSB1_Internal2_network:
         - Internal2-net
+        port_FSB1_Internal1_network:
+        - Internal1-net
+        vm_flavor_name:
+          get_input: fsb-flavor
+        port_FSB1_Internal2_mac_address:
+        - get_input: fsb1-Internal2-mac
         vm_image_name:
           get_input: fsb-image
         compute_FSB_admin_pass:
         - STATIC-DATA-FSB1
-        port_FSB1_Internal1_network:
-        - Internal1-net
         compute_FSB_metadata:
         - write_files:
           - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0
           - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
-        vm_flavor_name:
-          get_input: fsb-flavor
-        port_FSB1_Internal2_mac_address:
-        - get_input: fsb1-Internal2-mac
         compute_FSB_name:
         - get_input: fsb1-name
         service_template_filter:
@@ -198,4 +198,4 @@ topology_template:
       members:
       - FSB1_Internal2
       - FSB1_Internal1
-      - FSB1_template
+      - FSB1_template
\ 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/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
index ce35a8ed2a..92fc5bdb6e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
@@ -243,6 +243,11 @@ topology_template:
         port_FSB1_Internal_mac_address:
         - get_input: fsb1-Internal1-mac
         - get_input: fsb1-Internal2-mac
+        compute_FSB_user_data:
+        - OPTIONAL-DATA-FSB1
+        - null
+        vm_flavor_name:
+          get_input: fsb-flavor
         vm_image_name:
           get_input: fsb-image
         compute_FSB_admin_pass:
@@ -251,6 +256,9 @@ topology_template:
         port_FSB1_Internal_network:
         - Internal1-net-fsb1-Internal1
         - Internal1-net-fsb1-Internal2
+        port_FSB2_Internal_mac_address:
+        - get_input: fsb2-Internal1-mac
+        - get_input: fsb2-Internal2-mac
         port_FSB2_Internal_network:
         - Internal2-net-fsb2-Internal1
         - Internal2-net-fsb2-Internal2
@@ -261,17 +269,9 @@ topology_template:
         - write_files:
           - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0
           - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1
-        compute_FSB_user_data:
-        - OPTIONAL-DATA-FSB1
-        - null
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
         - get_input: fsb2_zone
-        vm_flavor_name:
-          get_input: fsb-flavor
-        port_FSB2_Internal_mac_address:
-        - get_input: fsb2-Internal1-mac
-        - get_input: fsb2-Internal2-mac
         compute_FSB_name:
         - get_input: fsb1-name
         - get_input: fsb2-name
@@ -296,4 +296,4 @@ topology_template:
       - FSB2_Internal1
       - FSB2_Internal2
       - FSB1_template
-      - FSB2_template
+      - FSB2_template
\ 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/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml
index 773801f9fa..209d729be8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml
@@ -148,12 +148,12 @@ topology_template:
         - get_input: fsb_zone
         port_FSB1_Internal_network:
         - Internal1-net
-        port_FSB2_Internal_network:
-        - Internal2-net
         vm_flavor_name:
           get_input: fsb1-flavor
         port_FSB2_Internal_mac_address:
         - get_input: fsb1-Internal2-mac
+        port_FSB2_Internal_network:
+        - Internal2-net
         service_template_filter:
           substitute_service_template: Nested_FSB1_0ServiceTemplate.yaml
           count: 1
@@ -291,4 +291,4 @@ topology_template:
             - abstract_FSB1_0
             - FSB1_FSB1_Internal_accessIPv6
         - 0
-        - OS-EXT-IPS-MAC:mac_addr
+        - OS-EXT-IPS-MAC:mac_addr
\ 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/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml
index f8872c5a9d..492e64573c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml
@@ -240,6 +240,11 @@ topology_template:
         port_FSB1_Internal_mac_address:
         - get_input: fsb1-Internal1-mac
         - get_input: fsb1-Internal2-mac
+        compute_FSB_user_data:
+        - STATIC-DATA-FSB1
+        - STATIC-DATA-FSB2
+        vm_flavor_name:
+          get_input: fsb-flavor
         vm_image_name:
           get_input: fsb-image
         compute_FSB_admin_pass:
@@ -248,6 +253,9 @@ topology_template:
         port_FSB1_Internal_network:
         - Internal1-net-fsb1-Internal1
         - Internal1-net-fsb1-Internal2
+        port_FSB2_Internal_mac_address:
+        - get_input: fsb2-Internal1-mac
+        - get_input: fsb2-Internal2-mac
         port_FSB2_Internal_network:
         - Internal2-net-fsb2-Internal1
         - Internal2-net-fsb2-Internal2
@@ -258,17 +266,9 @@ topology_template:
         - write_files:
           - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0
           - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1
-        compute_FSB_user_data:
-        - STATIC-DATA-FSB1
-        - STATIC-DATA-FSB2
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
         - get_input: fsb2_zone
-        vm_flavor_name:
-          get_input: fsb-flavor
-        port_FSB2_Internal_mac_address:
-        - get_input: fsb2-Internal1-mac
-        - get_input: fsb2-Internal2-mac
         compute_FSB_name:
         - get_input: fsb1-name
         - get_input: fsb2-name
@@ -317,4 +317,4 @@ topology_template:
       - FSB2_template
       - jsa_net
       - jsa_net1
-      - packet_mirror_network_name
+      - packet_mirror_network_name
\ 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/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
index af3ef63b0f..ce8bde09d3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
@@ -98,30 +98,30 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_port2_network:
-        - get_input: port_name
+        compute_smp_availability_zone:
+        - get_input: availability_zone_0
+        vm_flavor_name:
+          get_input: flavor_smp_name
+        compute_smp_user_data_format:
+        - RAW
         vm_image_name:
           get_input: image_smp_name
         port_port2_replacement_policy:
         - AUTO
         compute_smp_name:
         - get_input: smp_name_1
-        compute_smp_availability_zone:
-        - get_input: availability_zone_0
         port_port1_replacement_policy:
         - AUTO
         port_port1_network:
         - get_input: port_name
-        vm_flavor_name:
-          get_input: flavor_smp_name
+        port_port2_network:
+        - get_input: port_name
         compute_smp_metadata:
         - jx_vm_role: smp2
           vnf_id:
             get_input: vnf_id
           jx_lab_name:
             get_input: lab_name
-        compute_smp_user_data_format:
-        - RAW
         compute_smp_scheduler_hints:
         - group: BE_Affinity_group
         service_template_filter:
@@ -164,4 +164,4 @@ topology_template:
         name: abc
         affinity: host
       targets:
-      - FE_SMP_Affinity_group
+      - FE_SMP_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/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml
index b98c6e07bb..b7bb7cbb43 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml
@@ -253,6 +253,11 @@ topology_template:
         port_FSB1_Internal_mac_address:
         - get_input: fsb1-Internal1-mac
         - get_input: fsb1-Internal2-mac
+        compute_FSB_user_data:
+        - OPTIONAL-DATA-FSB1
+        - null
+        vm_flavor_name:
+          get_input: fsb-flavor
         vm_image_name:
           get_input: fsb-image
         compute_FSB_admin_pass:
@@ -261,6 +266,9 @@ topology_template:
         port_FSB1_Internal_network:
         - Internal1-net-fsb1-Internal1
         - Internal1-net-fsb1-Internal2
+        port_FSB2_Internal_mac_address:
+        - get_input: fsb2-Internal1-mac
+        - get_input: fsb2-Internal2-mac
         port_FSB2_Internal_network:
         - Internal2-net-fsb2-Internal1
         - Internal2-net-fsb2-Internal2
@@ -271,17 +279,9 @@ topology_template:
         - write_files:
           - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0
           - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1
-        compute_FSB_user_data:
-        - OPTIONAL-DATA-FSB1
-        - null
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
         - get_input: fsb2_zone
-        vm_flavor_name:
-          get_input: fsb-flavor
-        port_FSB2_Internal_mac_address:
-        - get_input: fsb2-Internal1-mac
-        - get_input: fsb2-Internal2-mac
         compute_FSB_name:
         - get_input: fsb1-name
         - get_input: fsb2-name
@@ -319,4 +319,4 @@ topology_template:
       - jsa_net
       - jsa_net1
       - packet_mirror_network
-      - jsa_security_group
+      - jsa_security_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/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml
index 6ebaa53c6a..44452b959f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml
@@ -99,14 +99,14 @@ topology_template:
       properties:
         compute_QRouter_availability_zone:
         - Availability-test
-        port_oam_private_net_network_port_network:
-        - get_input: oam_private_net_name
-        vm_image_name: Image-test
         compute_QRouter_config_drive:
         - true
         port_cdr_network_port_network:
         - get_input: cdr_network
         vm_flavor_name: FLAVOR-test
+        port_oam_private_net_network_port_network:
+        - get_input: oam_private_net_name
+        vm_image_name: Image-test
         compute_QRouter_name:
         - QRouter-name
         service_template_filter:
@@ -127,4 +127,4 @@ topology_template:
       - packet_mirror_network
       - packet_internal_network
       - cdr_network_port
-      - oam_private_net_network_port
+      - oam_private_net_network_port
\ 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/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml
index f554f0a844..5cd7faa646 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml
@@ -240,6 +240,11 @@ topology_template:
         port_FSB1_Internal_mac_address:
         - get_input: fsb1-Internal1-mac
         - get_input: fsb1-Internal2-mac
+        compute_FSB_user_data:
+        - OPTIONAL-DATA-FSB1
+        - null
+        vm_flavor_name:
+          get_input: fsb-flavor
         vm_image_name:
           get_input: fsb-image
         compute_FSB_admin_pass:
@@ -248,6 +253,9 @@ topology_template:
         port_FSB1_Internal_network:
         - Internal1-net-fsb1-Internal1
         - Internal1-net-fsb1-Internal2
+        port_FSB2_Internal_mac_address:
+        - get_input: fsb2-Internal1-mac
+        - get_input: fsb2-Internal2-mac
         port_FSB2_Internal_network:
         - Internal2-net-fsb2-Internal1
         - Internal2-net-fsb2-Internal2
@@ -258,17 +266,9 @@ topology_template:
         - write_files:
           - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0
           - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1
-        compute_FSB_user_data:
-        - OPTIONAL-DATA-FSB1
-        - null
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
         - get_input: fsb2_zone
-        vm_flavor_name:
-          get_input: fsb-flavor
-        port_FSB2_Internal_mac_address:
-        - get_input: fsb2-Internal1-mac
-        - get_input: fsb2-Internal2-mac
         compute_FSB_name:
         - get_input: fsb1-name
         - get_input: fsb2-name
@@ -309,4 +309,4 @@ topology_template:
       - FSB2_template
       - jsa_net
       - jsa_net1
-      - packet_mirror_network_name
+      - packet_mirror_network_name
\ 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/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
index 45b3f46412..1779261886 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
@@ -175,16 +175,18 @@ topology_template:
       properties:
         port_FSB1_Internal_mac_address:
         - get_input: fsb1-Internal1-mac
-        port_FSB1_Internal_network:
-        - Internal1-net
         vm_flavor_name:
           get_input: fsb-flavor
-        port_FSB2_Internal_mac_address:
-        - get_input: fsb1-Internal2-mac
         vm_image_name:
           get_input: fsb-image
         compute_FSB_admin_pass:
         - STATIC-DATA-FSB1
+        port_FSB_OAM_network:
+        - jsa_net1
+        port_FSB1_Internal_network:
+        - Internal1-net
+        port_FSB2_Internal_mac_address:
+        - get_input: fsb1-Internal2-mac
         port_FSB_OAM_fixed_ips:
         - - ip_address:
               get_input: fsb1-oam-ip
@@ -196,8 +198,6 @@ topology_template:
           - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
-        port_FSB_OAM_network:
-        - jsa_net1
         compute_FSB_name:
         - get_input: fsb1-name
         service_template_filter:
@@ -233,4 +233,4 @@ topology_template:
       - FSB1_Internal1
       - FSB1_OAM
       - FSB1_template
-      - packet_mirror_network_name
+      - packet_mirror_network_name
\ 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/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
index 5e53a1d849..e5513bd30a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
@@ -280,6 +280,11 @@ topology_template:
         port_FSB1_Internal_mac_address:
         - get_input: fsb1-Internal1-mac
         - get_input: fsb1-Internal2-mac
+        compute_FSB_user_data:
+        - OPTIONAL-DATA-FSB1
+        - null
+        vm_flavor_name:
+          get_input: fsb-flavor
         vm_image_name:
           get_input: fsb-image
         compute_FSB_admin_pass:
@@ -288,6 +293,9 @@ topology_template:
         port_FSB1_Internal_network:
         - Internal1-net-fsb1-Internal1
         - Internal1-net-fsb1-Internal2
+        port_FSB2_Internal_mac_address:
+        - get_input: fsb2-Internal1-mac
+        - get_input: fsb2-Internal2-mac
         port_FSB2_Internal_network:
         - Internal2-net-fsb2-Internal1
         - Internal2-net-fsb2-Internal2
@@ -298,17 +306,9 @@ topology_template:
         - write_files:
           - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0
           - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1
-        compute_FSB_user_data:
-        - OPTIONAL-DATA-FSB1
-        - null
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
         - get_input: fsb2_zone
-        vm_flavor_name:
-          get_input: fsb-flavor
-        port_FSB2_Internal_mac_address:
-        - get_input: fsb2-Internal1-mac
-        - get_input: fsb2-Internal2-mac
         compute_FSB_name:
         - get_input: fsb1-name
         - get_input: fsb2-name
@@ -357,4 +357,4 @@ topology_template:
       - FSB2_template
       - jsa_net
       - jsa_net1
-      - packet_mirror_network_name
+      - packet_mirror_network_name
\ 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/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
index 06b43188e5..54d4cfe9ee 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
@@ -195,16 +195,18 @@ topology_template:
       properties:
         port_FSB1_Internal_mac_address:
         - get_input: fsb1-Internal1-mac
-        port_FSB1_Internal_network:
-        - Internal1-net
         vm_flavor_name:
           get_input: fsb-flavor
-        port_FSB2_Internal_mac_address:
-        - get_input: fsb1-Internal2-mac
         vm_image_name:
           get_input: fsb-image
         compute_FSB_admin_pass:
         - STATIC-DATA-FSB1
+        port_FSB_OAM_network:
+        - jsa_net1
+        port_FSB1_Internal_network:
+        - Internal1-net
+        port_FSB2_Internal_mac_address:
+        - get_input: fsb1-Internal2-mac
         port_FSB_OAM_fixed_ips:
         - - ip_address:
               get_input: fsb1-oam-ip
@@ -216,8 +218,6 @@ topology_template:
           - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1
         compute_FSB_availability_zone:
         - get_input: fsb1_zone
-        port_FSB_OAM_network:
-        - jsa_net1
         compute_FSB_name:
         - get_input: fsb1-name
         service_template_filter:
@@ -261,4 +261,4 @@ topology_template:
       - FSB1_Internal1
       - FSB1_OAM
       - FSB1_template
-      - packet_mirror_network_name
+      - packet_mirror_network_name
\ 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/vol_attach/nested_with_inner_vol/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/inputfiles/main.yml
index b97dd4b535..0894686026 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/inputfiles/main.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/inputfiles/main.yml
@@ -62,7 +62,7 @@ parameters:
 
 resources:
 
-  server_cmaui:
+  server_cmaui_1:
     type: nested.yml
     properties:
       cmaui_names: { get_param: [cmaui_names, 0]}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/inputfiles/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/inputfiles/nested.yml
index cdaf251b85..d205cee2be 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/inputfiles/nested.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/inputfiles/nested.yml
@@ -82,9 +82,9 @@ resources:
      type: OS::Cinder::VolumeAttachment
      properties:
        volume_id: {get_param: out_cmaui_volume}
-       instance_uuid: {get_resource: server_cmaui}
+       instance_uuid: {get_resource: server_cmaui_2}
 
-  server_cmaui:
+  server_cmaui_2:
     type: OS::Nova::Server
     properties:
       name: { get_param: [cmaui_names, 0]}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c215d730a6..9ef461e1de 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -103,14 +103,14 @@ node_types:
         type: string
         status: SUPPORTED
     requirements:
-    - dependency_server_cmaui:
+    - dependency_server_cmaui_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_server_cmaui:
+    - local_storage_server_cmaui_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
@@ -138,19 +138,19 @@ node_types:
         - 1
         - 1
     capabilities:
-      cpu.delta_server_cmaui:
+      disk.write.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests.rate_server_cmaui:
+      disk.device.write.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_server_cmaui:
+      disk.device.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -162,84 +162,69 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      scalable_server_cmaui:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.bytes.rate_server_cmaui:
+      disk.write.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_server_cmaui_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes.rate_server_cmaui:
+      disk.device.latency_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes.rate_server_cmaui:
+      disk.allocation_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      host_server_cmaui:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
-        occurrences:
-        - 1
-        - UNBOUNDED
-      cpu_util_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_0:
-        type: tosca.capabilities.Node
+      binding_server_cmaui_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_server_cmaui:
+      disk.root.size_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_cmaui:
+      disk.device.write.requests.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.requests_server_cmaui:
+      vcpus_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_server_cmaui_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_server_cmaui:
+      network.outgoing.packets.rate_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.usage_server_cmaui:
+      disk.read.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -250,101 +235,114 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.usage_server_cmaui:
+      network.outgoing.bytes_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_0:
+      disk.write.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.capacity_server_cmaui:
+      disk.device.iops_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_server_cmaui:
+      disk.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_server_cmaui:
+      disk.device.capacity_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      instance_server_cmaui:
+      disk.device.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.bytes_server_cmaui:
+      endpoint_server_cmaui_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory_server_cmaui:
+      os_server_cmaui_2:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_cmaui:
+      disk.write.requests.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_cmaui:
-        type: tosca.capabilities.network.Bindable
+      memory_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_server_cmaui:
+      cpu_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.bytes_server_cmaui:
+      disk.device.allocation_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_server_cmaui:
-        type: tosca.capabilities.OperatingSystem
+      host_server_cmaui_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes.rate_server_cmaui:
+      network.incoming.packets_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_0:
+      disk.ephemeral.size_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.resident_server_cmaui:
+      disk.capacity_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.latency_server_cmaui:
+      instance_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -357,59 +355,60 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-      feature_server_cmaui:
+      feature_cmaui_volume:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_volume:
-        type: tosca.capabilities.Node
+      network.incoming.bytes.rate_cmaui_port_0:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_server_cmaui:
+      disk.iops_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_0:
+      disk.device.write.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.bytes_server_cmaui:
+      disk.device.read.requests_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_server_cmaui:
+      network.outpoing.packets_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests_server_cmaui:
+      disk.read.bytes.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_server_cmaui:
+      cpu.delta_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_0:
+      disk.device.read.requests.rate_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_server_cmaui:
+      memory.resident_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -421,35 +420,36 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      endpoint_server_cmaui:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.latency_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.iops_server_cmaui:
+      cpu_util_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.iops_server_cmaui:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_cmaui_volume:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_server_cmaui:
+      network.incoming.bytes_cmaui_port_0:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_volume:
-        type: tosca.capabilities.Attachment
+      disk.device.write.bytes.rate_server_cmaui_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_0:
+      memory.usage_server_cmaui_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/MainServiceTemplate.yaml
index d59250444f..b0c76462ac 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/MainServiceTemplate.yaml
@@ -99,7 +99,7 @@ topology_template:
       type: string
       description: the name of the target volume backend
   node_templates:
-    server_cmaui:
+    server_cmaui_1:
       type: org.openecomp.resource.abstract.nodes.heat.nested
       directives:
       - substitutable
@@ -123,4 +123,4 @@ topology_template:
         heat_file: ../Artifacts/main.yml
         description: cmaui server template for vMMSC
       members:
-      - server_cmaui
\ No newline at end of file
+      - server_cmaui_1
\ 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/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml
index 7dd65fdfa5..9da203c466 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml
@@ -114,7 +114,7 @@ topology_template:
       type: string
       description: the name of the target volume backend
   node_templates:
-    server_cmaui:
+    server_cmaui_2:
       type: org.openecomp.resource.vfc.nodes.heat.cmaui
       properties:
         flavor:
@@ -168,14 +168,14 @@ topology_template:
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: server_cmaui
+          node: server_cmaui_2
           relationship: tosca.relationships.network.BindsTo
   relationship_templates:
     cmaui_volume_attachment:
       type: org.openecomp.relationships.VolumeAttachesTo
       properties:
         volume_id: cmaui_volume
-        instance_uuid: server_cmaui
+        instance_uuid: server_cmaui_2
   groups:
     a_vol_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -190,7 +190,7 @@ topology_template:
         heat_file: ../Artifacts/nested.yml
         description: cmaui server template for vMMSC
       members:
-      - server_cmaui
+      - server_cmaui_2
       - cmaui_port_0
   outputs:
     out_cmaui_volume:
@@ -198,181 +198,181 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested
     capabilities:
-      cpu.delta_server_cmaui:
-      - server_cmaui
-      - cpu.delta
-      disk.device.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests.rate
-      disk.device.allocation_server_cmaui:
-      - server_cmaui
-      - disk.device.allocation
+      disk.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes.rate
+      disk.device.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes
+      disk.device.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.usage
       network.incoming.packets.rate_cmaui_port_0:
       - cmaui_port_0
       - network.incoming.packets.rate
-      scalable_server_cmaui:
-      - server_cmaui
-      - scalable
-      disk.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes.rate
-      cpu_server_cmaui:
-      - server_cmaui
-      - cpu
-      disk.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes.rate
-      disk.device.read.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.bytes.rate
-      host_server_cmaui:
-      - server_cmaui
-      - host
-      cpu_util_server_cmaui:
-      - server_cmaui
-      - cpu_util
+      disk.write.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.bytes
+      feature_server_cmaui_2:
+      - server_cmaui_2
+      - feature
+      disk.device.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.latency
+      disk.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.allocation
       feature_cmaui_port_0:
       - cmaui_port_0
       - feature
-      disk.device.latency_server_cmaui:
-      - server_cmaui
-      - disk.device.latency
-      disk.device.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.write.requests
-      disk.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.read.requests
+      binding_server_cmaui_2:
+      - server_cmaui_2
+      - binding
+      disk.root.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.root.size
+      disk.device.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests.rate
+      vcpus_server_cmaui_2:
+      - server_cmaui_2
+      - vcpus
+      scalable_server_cmaui_2:
+      - server_cmaui_2
+      - scalable
       network.outgoing.packets.rate_cmaui_port_0:
       - cmaui_port_0
       - network.outgoing.packets.rate
-      disk.device.capacity_server_cmaui:
-      - server_cmaui
-      - disk.device.capacity
-      disk.usage_server_cmaui:
-      - server_cmaui
-      - disk.usage
+      disk.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.requests
       attachment_cmaui_port_0:
       - cmaui_port_0
       - attachment
-      disk.device.usage_server_cmaui:
-      - server_cmaui
-      - disk.device.usage
       network.outgoing.bytes_cmaui_port_0:
       - cmaui_port_0
       - network.outgoing.bytes
-      disk.capacity_server_cmaui:
-      - server_cmaui
-      - disk.capacity
-      disk.write.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.write.requests.rate
-      disk.device.read.requests_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests
-      instance_server_cmaui:
-      - server_cmaui
-      - instance
-      disk.device.read.bytes_server_cmaui:
-      - server_cmaui
+      disk.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests
+      disk.device.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.iops
+      disk.usage_server_cmaui_2:
+      - server_cmaui_2
+      - disk.usage
+      disk.device.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.capacity
+      disk.device.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.bytes.rate
+      endpoint_server_cmaui_2:
+      - server_cmaui_2
+      - endpoint
+      disk.read.bytes_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes
+      os_server_cmaui_2:
+      - server_cmaui_2
+      - os
+      disk.device.read.bytes_server_cmaui_2:
+      - server_cmaui_2
       - disk.device.read.bytes
-      memory_server_cmaui:
-      - server_cmaui
+      disk.write.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.write.requests.rate
+      memory_server_cmaui_2:
+      - server_cmaui_2
       - memory
-      disk.root.size_server_cmaui:
-      - server_cmaui
-      - disk.root.size
-      binding_server_cmaui:
-      - server_cmaui
-      - binding
-      disk.device.read.requests.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.read.requests.rate
-      disk.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.write.bytes
-      os_server_cmaui:
-      - server_cmaui
-      - os
-      disk.device.write.bytes.rate_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes.rate
+      cpu_server_cmaui_2:
+      - server_cmaui_2
+      - cpu
+      disk.device.allocation_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.allocation
+      host_server_cmaui_2:
+      - server_cmaui_2
+      - host
       network.incoming.packets_cmaui_port_0:
       - cmaui_port_0
       - network.incoming.packets
-      memory.resident_server_cmaui:
-      - server_cmaui
-      - memory.resident
-      disk.latency_server_cmaui:
-      - server_cmaui
-      - disk.latency
+      disk.ephemeral.size_server_cmaui_2:
+      - server_cmaui_2
+      - disk.ephemeral.size
+      disk.capacity_server_cmaui_2:
+      - server_cmaui_2
+      - disk.capacity
+      instance_server_cmaui_2:
+      - server_cmaui_2
+      - instance
       binding_cmaui_port_0:
       - cmaui_port_0
       - binding
-      feature_server_cmaui:
-      - server_cmaui
-      - feature
       feature_cmaui_volume:
       - cmaui_volume
       - feature
-      vcpus_server_cmaui:
-      - server_cmaui
-      - vcpus
       network.incoming.bytes.rate_cmaui_port_0:
       - cmaui_port_0
       - network.incoming.bytes.rate
-      disk.device.write.bytes_server_cmaui:
-      - server_cmaui
-      - disk.device.write.bytes
-      disk.allocation_server_cmaui:
-      - server_cmaui
-      - disk.allocation
-      disk.write.requests_server_cmaui:
-      - server_cmaui
-      - disk.write.requests
-      memory.usage_server_cmaui:
-      - server_cmaui
-      - memory.usage
+      disk.iops_server_cmaui_2:
+      - server_cmaui_2
+      - disk.iops
+      disk.device.write.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.requests
+      disk.device.read.requests_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests
       network.outpoing.packets_cmaui_port_0:
       - cmaui_port_0
       - network.outpoing.packets
-      disk.ephemeral.size_server_cmaui:
-      - server_cmaui
-      - disk.ephemeral.size
+      disk.read.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.read.bytes.rate
+      cpu.delta_server_cmaui_2:
+      - server_cmaui_2
+      - cpu.delta
+      disk.device.read.requests.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.read.requests.rate
+      memory.resident_server_cmaui_2:
+      - server_cmaui_2
+      - memory.resident
       network.outgoing.bytes.rate_cmaui_port_0:
       - cmaui_port_0
       - network.outgoing.bytes.rate
-      endpoint_server_cmaui:
-      - server_cmaui
-      - endpoint
-      disk.iops_server_cmaui:
-      - server_cmaui
-      - disk.iops
-      disk.device.iops_server_cmaui:
-      - server_cmaui
-      - disk.device.iops
-      disk.read.bytes_server_cmaui:
-      - server_cmaui
-      - disk.read.bytes
+      disk.latency_server_cmaui_2:
+      - server_cmaui_2
+      - disk.latency
+      cpu_util_server_cmaui_2:
+      - server_cmaui_2
+      - cpu_util
       attachment_cmaui_volume:
       - cmaui_volume
       - attachment
       network.incoming.bytes_cmaui_port_0:
       - cmaui_port_0
       - network.incoming.bytes
+      disk.device.write.bytes.rate_server_cmaui_2:
+      - server_cmaui_2
+      - disk.device.write.bytes.rate
+      memory.usage_server_cmaui_2:
+      - server_cmaui_2
+      - memory.usage
     requirements:
-      dependency_server_cmaui:
-      - server_cmaui
-      - dependency
-      local_storage_server_cmaui:
-      - server_cmaui
-      - local_storage
       dependency_cmaui_port_0:
       - cmaui_port_0
       - dependency
       link_cmaui_port_0:
       - cmaui_port_0
       - link
+      local_storage_server_cmaui_2:
+      - server_cmaui_2
+      - local_storage
+      dependency_server_cmaui_2:
+      - server_cmaui_2
+      - dependency
       dependency_cmaui_volume:
       - cmaui_volume
       - dependency
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/FeatureGroupDaoZusammenImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/FeatureGroupDaoZusammenImpl.java
index ee6ffbfca2..624ffeb05e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/FeatureGroupDaoZusammenImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/FeatureGroupDaoZusammenImpl.java
@@ -176,8 +176,12 @@ public class FeatureGroupDaoZusammenImpl implements FeatureGroupDao {
           mapElementInfoToFeatureGroup(featureGroup.getId(), featureGroup.getVersion(),
               elementInfo.get());
 
-      currentFeatureGroup.getEntitlementPoolIds().removeAll(removedEntitlementPools);
-      currentFeatureGroup.getEntitlementPoolIds().addAll(addedEntitlementPools);
+      if (!(removedEntitlementPools == null)) {
+        currentFeatureGroup.getEntitlementPoolIds().removeAll(removedEntitlementPools);
+      }
+      if (!(addedEntitlementPools == null)) {
+        currentFeatureGroup.getEntitlementPoolIds().addAll(addedEntitlementPools);
+      }
       if (featureGroupElement.getRelations() == null) {
         featureGroupElement.setRelations(new ArrayList<>());
       }
@@ -187,7 +191,12 @@ public class FeatureGroupDaoZusammenImpl implements FeatureGroupDao {
                   .createRelation(RelationType.FeatureGroupToEntitlmentPool, relation))
               .collect(Collectors.toList()));
 
-      currentFeatureGroup.getLicenseKeyGroupIds().removeAll(removedLicenseKeyGroups);
+      if (!(removedLicenseKeyGroups == null)) {
+        currentFeatureGroup.getLicenseKeyGroupIds().removeAll(removedLicenseKeyGroups);
+      }
+      if (!(addedLicenseKeyGroups == null)) {
+        currentFeatureGroup.getLicenseKeyGroupIds().addAll(addedLicenseKeyGroups);
+      }
       currentFeatureGroup.getLicenseKeyGroupIds().addAll(addedLicenseKeyGroups);
       featureGroupElement.getRelations()
           .addAll(currentFeatureGroup.getLicenseKeyGroupIds().stream()
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseAgreementDaoZusammenImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseAgreementDaoZusammenImpl.java
index 55bbae9b33..45c831fbd7 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseAgreementDaoZusammenImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/LicenseAgreementDaoZusammenImpl.java
@@ -187,8 +187,13 @@ public class LicenseAgreementDaoZusammenImpl implements LicenseAgreementDao {
           mapElementInfoToLicenseAgreement(licenseAgreement.getId(), licenseAgreement.getVersion(),
               elementInfo.get());
 
-      currentLicenseAgreement.getFeatureGroupIds().removeAll(removedFeatureGroupIds);
-      currentLicenseAgreement.getFeatureGroupIds().addAll(addedFeatureGroupIds);
+      if (! (removedFeatureGroupIds == null) ) {
+        currentLicenseAgreement.getFeatureGroupIds().removeAll(removedFeatureGroupIds);
+      }
+
+      if (! (addedFeatureGroupIds == null)) {
+        currentLicenseAgreement.getFeatureGroupIds().addAll(addedFeatureGroupIds);
+      }
       licenseAgreementElement.setRelations(currentLicenseAgreement.getFeatureGroupIds().stream()
           .map(relation -> VlmZusammenUtil
               .createRelation(RelationType.LicenseAgreementToFeatureGroup, relation))
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/MibDao.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/MibDao.java
index cf980a52ff..1efd21ccbf 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/MibDao.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/MibDao.java
@@ -38,4 +38,6 @@ public interface MibDao extends VersionableDao {
   Collection<MibEntity> list(MibEntity entity);
 
   void deleteAll(MibEntity entity);
+
+  Collection<MibEntity> listArtifacts(MibEntity entity);
 }
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/MibDaoZusammenImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/MibDaoZusammenImpl.java
index 10cdfbd9da..d56db41cee 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/MibDaoZusammenImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/MibDaoZusammenImpl.java
@@ -135,6 +135,38 @@ public class MibDaoZusammenImpl implements MibDao {
         VspZusammenUtil.aggregateElements(componentElement, mibsElement), "Delete mibs");
   }
 
+  @Override
+  public Collection<MibEntity> listArtifacts(MibEntity mib) {
+    SessionContext context = ZusammenUtil.createSessionContext();
+    Id itemId = new Id(mib.getVspId());
+    ElementContext elementContext = new ElementContext(itemId,
+        VspZusammenUtil.getFirstVersionId(context, itemId, zusammenAdaptor),
+        VspZusammenUtil.getVersionTag(mib.getVersion()));
+
+    final Optional<Element> elementByName =
+        zusammenAdaptor.getElementByName(context, elementContext, new Id(mib.getComponentId()
+        ), StructureElement.Mibs.name());
+
+    if(!elementByName.isPresent())
+      return null;
+    else {
+      final Id elementId = elementByName.get().getElementId();
+      return zusammenAdaptor.listElementData(context, elementContext, elementId).stream()
+          .map(element ->
+              buildMibEntity(element,mib)
+          ).collect(Collectors.toList());
+    }
+  }
+
+  private MibEntity buildMibEntity (Element element, MibEntity mib) {
+    MibEntity createdMib = new MibEntity(mib.getVspId(), mib.getVersion(), mib.getComponentId(),
+        null);
+    createdMib.setArtifactName((String) element.getInfo().getProperties().get(ARTIFACT_NAME));
+    createdMib.setArtifact(ByteBuffer.wrap(FileUtils.toByteArray(element.getData())));
+    createdMib.setType( ArtifactType.valueOf(element.getInfo().getName()));
+    return createdMib;
+  }
+
   private ZusammenElement buildComponentElement(MibEntity mibEntity) {
     ZusammenElement componentElement = new ZusammenElement();
     componentElement.setElementId(new Id(mibEntity.getComponentId()));
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/OrchestrationTemplateDaoZusammenImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/OrchestrationTemplateDaoZusammenImpl.java
index 83a78bc705..2b6d52a38a 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/OrchestrationTemplateDaoZusammenImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/OrchestrationTemplateDaoZusammenImpl.java
@@ -5,6 +5,7 @@ import com.amdocs.zusammen.adaptor.inbound.api.types.item.ElementInfo;
 import com.amdocs.zusammen.adaptor.inbound.api.types.item.ZusammenElement;
 import com.amdocs.zusammen.datatypes.Id;
 import com.amdocs.zusammen.datatypes.SessionContext;
+import com.amdocs.zusammen.datatypes.item.Action;
 import com.amdocs.zusammen.datatypes.item.ElementContext;
 import com.amdocs.zusammen.utils.fileutils.FileUtils;
 import org.openecomp.core.zusammen.api.ZusammenAdaptor;
@@ -13,7 +14,6 @@ import org.openecomp.sdc.vendorsoftwareproduct.dao.OrchestrationTemplateDao;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.UploadData;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.UploadDataEntity;
 import org.openecomp.sdc.versioning.dao.types.Version;
-import org.openecomp.sdc.versioning.dao.types.VersionStatus;
 
 import java.io.ByteArrayInputStream;
 import java.nio.ByteBuffer;
@@ -89,11 +89,11 @@ public class OrchestrationTemplateDaoZusammenImpl implements OrchestrationTempla
         VspZusammenUtil.buildStructuralElement(StructureElement.OrchestrationTemplate, null);
     ZusammenElement orchestrationTemplateValidationDataElement =
         VspZusammenUtil
-            .buildStructuralElement(StructureElement.OrchestrationTemplateValidationData, null);
+            .buildStructuralElement(StructureElement.OrchestrationTemplateValidationData, Action.UPDATE);
     orchestrationTemplateValidationDataElement.setData(new ByteArrayInputStream(uploadData
         .getValidationData().getBytes()));
     ZusammenElement orchestrationTemplateContent =
-        VspZusammenUtil.buildStructuralElement(StructureElement.OrchestrationTemplateContent, null);
+        VspZusammenUtil.buildStructuralElement(StructureElement.OrchestrationTemplateContent, Action.UPDATE);
     orchestrationTemplateContent
         .setData(new ByteArrayInputStream(uploadData.getContentData().array()));
     orchestrationTemplateElement.addSubElement(orchestrationTemplateValidationDataElement);
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/ProcessDaoZusammenImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/ProcessDaoZusammenImpl.java
index ffc9cb2901..b0cff4371e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/ProcessDaoZusammenImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/zusammen/ProcessDaoZusammenImpl.java
@@ -197,6 +197,9 @@ public class ProcessDaoZusammenImpl implements ProcessDao {
     processEntity
         .setArtifactName((String) elementInfo.getInfo().getProperties().get(ARTIFACT_NAME));
     processEntity.setDescription((String) elementInfo.getInfo().getProperties().get(DESCRIPTION));
+    processEntity.setType( elementInfo.getInfo().getProperties().get(PROCESS_TYPE) != null ?
+            ProcessType.valueOf((String) elementInfo.getInfo().getProperties().get(PROCESS_TYPE)) :
+            null);
     return processEntity;
   }
 
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java
index d15014286f..7efb70494d 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java
@@ -214,7 +214,7 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
         .getNetworkDescription(), TAB + TAB + TAB + TAB));
     networkOpt.ifPresent(network -> addEntryWithIndent(VNICS_NETWORK, network.toString(),
         TAB + TAB + TAB + TAB));
-    addEntryWithIndent(VNICS_PROTOCOLS, nicQuestionnaire.getProtocols().toString(),
+    addEntryWithIndent(VNICS_PROTOCOLS, nicQuestionnaire.getProtocols() == null ? "" : nicQuestionnaire.getProtocols().toString(),
         TAB + TAB + TAB + TAB);
 
     Optional<IpConfiguration> ipconfigOpt = Optional.of(nicQuestionnaire).map
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java
index 7d408ab82e..ac7cab6c51 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaAnalyzerService.java
@@ -24,6 +24,7 @@ import org.openecomp.sdc.tosca.datatypes.ToscaElementTypes;
 import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
 import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
 import org.openecomp.sdc.tosca.datatypes.model.NodeType;
+import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition;
 import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment;
 import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
 
@@ -76,4 +77,7 @@ public interface ToscaAnalyzerService {
   boolean isRequirementExistInNodeTemplate(NodeTemplate nodeTemplate,
                                            String requirementId,
                                            RequirementAssignment requirementAssignment);
+
+  public Map<String, PropertyDefinition> manageSubstitutionNodeTypeProperties(
+      ServiceTemplate substitutionServiceTemplate);
 }
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java
index e7aacb96cf..eaf3fb492f 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImpl.java
@@ -94,7 +94,7 @@ public class ToscaAnalyzerServiceImpl implements ToscaAnalyzerService {
         .filter(nodeTypes -> Objects.nonNull(nodeTypes) && nodeTypes.containsKey(nodeTypeKey))
         .findFirst();
     if (nodeTypeMap.isPresent()) {
-      return Optional.ofNullable(nodeTypeMap.get().values().iterator().next());
+      return Optional.ofNullable(nodeTypeMap.get().get(nodeTypeKey));
     }
     return Optional.empty();
   }
@@ -601,7 +601,7 @@ public class ToscaAnalyzerServiceImpl implements ToscaAnalyzerService {
     return substitutionNodeType;
   }
 
-  private Map<String, PropertyDefinition> manageSubstitutionNodeTypeProperties(
+  public Map<String, PropertyDefinition> manageSubstitutionNodeTypeProperties(
       ServiceTemplate substitutionServiceTemplate) {
     Map<String, PropertyDefinition> substitutionNodeTypeProperties = new HashMap<>();
     Map<String, ParameterDefinition> properties =
diff --git a/openecomp-be/sonar-project.properties b/openecomp-be/sonar-project.properties
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/sonar-project.properties
+++ /dev/null
diff --git a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
index 6e588eb22a..d525c62474 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
@@ -136,7 +136,6 @@
             "minimum": {
               "type": "number",
               "minimum": 0,
-              "exclusiveMinimum": true,
               "maximum": 100
             },
             "maximum": {
diff --git a/openecomp-be/tools/migration/1702_to_1707_zusammen/pom.xml b/openecomp-be/tools/migration/1702_to_1707_zusammen/pom.xml
index 7bc93bddab..1f281c950b 100644
--- a/openecomp-be/tools/migration/1702_to_1707_zusammen/pom.xml
+++ b/openecomp-be/tools/migration/1702_to_1707_zusammen/pom.xml
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.amdocs.zusammen.plugin</groupId>
             <artifactId>zusammen-state-store-cassandra-plugin</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
diff --git a/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java b/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java
index 283c9cf25d..c43cf32001 100644
--- a/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java
+++ b/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java
@@ -78,7 +78,7 @@ public class MigrationMain {
     printMessage(logger, "Checking whether a migration has already been run.");
     if (MigrationMarker.isMigrated()) {
       printMessage(logger, "The DB has already been migrated, this script will now exit.");
-      return;
+      System.exit(status);
     }
     ItemCassandraDao itemCassandraDao = new ItemCassandraDao();
     VersionCassandraDao versionCassandraDao = new VersionCassandraDao();
@@ -243,7 +243,8 @@ public class MigrationMain {
         new OrchestrationTemplateCandidateCassandraLoader();
 
     orchestrationTemplateCandidateCassandraLoader.list().stream()
-        .filter(entity -> needMigration(entity.getId(), entity.getVersion()))
+        .filter(entity -> needMigration(entity.getId(), entity.getVersion()) &&
+            entity.getContentData()!=null && entity.getFilesDataStructure()!=null)
         .forEach(entity -> ElementHandler
             .save(context, cassandraElementRepository, entity.getId(), entity.getVersion(),
                 OrchestrationTemplateCandidateConvertor