push addional code

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

459 files changed, 24726 insertions, 0 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml
new file mode 100644
index 0000000000..bacd79a97a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml
@@ -0,0 +1,100 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.openecomp.sdc</groupId>
+        <artifactId>openecomp-sdc-lib</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../..</relativePath>
+    </parent>
+
+    <name>openecomp-sdc-validation-impl</name>
+    <artifactId>openecomp-sdc-validation-impl</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.17</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.3.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.10</version>
+
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.2</version>
+
+        </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+            <version>6.8.5</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>snakeyaml</artifactId>
+                    <groupId>org.yaml</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openecomp.core</groupId>
+            <artifactId>openecomp-utilities-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openecomp.sdc</groupId>
+            <artifactId>openecomp-sdc-validation-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openecomp.core</groupId>
+            <artifactId>openecomp-common-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+            <version>1.10.19</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>19.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openecomp.core</groupId>
+            <artifactId>openecomp-heat-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
+
+
+    </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/HeatValidationService.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/HeatValidationService.java
new file mode 100644
index 0000000000..920724ed3b
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/HeatValidationService.java
@@ -0,0 +1,323 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.validation.impl.util;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.openecomp.core.utilities.yaml.YamlUtil;
+import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
+import org.openecomp.core.validation.errors.Messages;
+import org.openecomp.core.validation.types.GlobalValidationContext;
+import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.heat.datatypes.model.Environment;
+import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
+import org.openecomp.sdc.heat.datatypes.model.Output;
+import org.openecomp.sdc.heat.datatypes.model.Resource;
+import org.openecomp.sdc.heat.datatypes.model.ResourceReferenceFunctions;
+import org.openecomp.sdc.heat.services.HeatStructureUtil;
+import org.openecomp.sdc.validation.impl.validators.HeatValidator;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+public class HeatValidationService {
+
+  private static final Logger logger = LoggerFactory.getLogger(HeatValidator.class);
+
+  /**
+   * Check artifacts existence.
+   *
+   * @param fileName       the file name
+   * @param artifactsNames the artifacts names
+   * @param globalContext  the global context
+   */
+  public static void checkArtifactsExistence(String fileName, Set<String> artifactsNames,
+                                             GlobalValidationContext globalContext) {
+    artifactsNames
+        .stream()
+        .filter(artifactName -> !globalContext.getFileContextMap().containsKey(artifactName))
+        .forEach(artifactName -> {
+          globalContext
+              .addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+                  .getErrorWithParameters(Messages.MISSING_ARTIFACT.getErrorMessage(),
+                      artifactName));
+        });
+  }
+
+
+  /**
+   * Check resource existence from resources map.
+   *
+   * @param fileName         the file name
+   * @param resourcesNames   the resources names
+   * @param valuesToSearchIn the values to search in
+   * @param globalContext    the global context
+   */
+  public static void checkResourceExistenceFromResourcesMap(String fileName,
+                                                            Set<String> resourcesNames,
+                                                            Collection<?> valuesToSearchIn,
+                                                            GlobalValidationContext globalContext) {
+    if (CollectionUtils.isNotEmpty(valuesToSearchIn)) {
+      for (Object value : valuesToSearchIn) {
+        if (value instanceof Resource) {
+          Resource resource = (Resource) value;
+          //checkResourceDependsOn(fileName,resource,resourcesNames,globalContext);
+
+          Collection<Object> resourcePropertiesValues =
+              resource.getProperties() == null ? null : resource.getProperties().values();
+          if (CollectionUtils.isNotEmpty(resourcePropertiesValues)) {
+            for (Object propertyValue : resourcePropertiesValues) {
+              handleReferencedResources(fileName, propertyValue, resourcesNames, globalContext);
+            }
+          }
+        } else if (value instanceof Output) {
+          Output output = (Output) value;
+          Object outputsValue = output.getValue();
+          handleReferencedResources(fileName, outputsValue, resourcesNames, globalContext);
+        }
+      }
+    }
+  }
+
+
+  private static void handleReferencedResources(String fileName, Object valueToSearchReferencesIn,
+                                                Set<String> resourcesNames,
+                                                GlobalValidationContext globalContext) {
+    Set<String> referencedResourcesNames = HeatStructureUtil
+        .getReferencedValuesByFunctionName(fileName,
+            ResourceReferenceFunctions.GET_RESOURCE.getFunction(), valueToSearchReferencesIn,
+            globalContext);
+    if (CollectionUtils.isNotEmpty(referencedResourcesNames)) {
+      HeatValidationService
+          .checkIfResourceReferenceExist(fileName, resourcesNames, referencedResourcesNames,
+              globalContext);
+    }
+  }
+
+
+  private static void checkIfResourceReferenceExist(String fileName,
+                                                    Set<String> referencedResourcesNames,
+                                                    Set<String> referencedResources,
+                                                    GlobalValidationContext globalContext) {
+    referencedResources.stream()
+        .filter(referencedResource -> !referencedResourcesNames.contains(referencedResource))
+        .forEach(referencedResource -> {
+          globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+              .getErrorWithParameters(Messages.REFERENCED_RESOURCE_NOT_FOUND.getErrorMessage(),
+                  referencedResource));
+        });
+  }
+
+  /**
+   * Draw files loop string.
+   *
+   * @param filesInPath the files in path
+   * @return the string
+   */
+  public static String drawFilesLoop(List<String> filesInPath) {
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append("[");
+    int pathSize = filesInPath.size();
+
+    for (int i = 0; i < pathSize; i++) {
+      stringBuilder.append(filesInPath.get(i));
+      if (i != pathSize - 1) {
+        stringBuilder.append(" -- ");
+      }
+    }
+    if (!filesInPath.get(0).equals(filesInPath.get(pathSize - 1))) {
+      stringBuilder.append(" -- ");
+      stringBuilder.append(filesInPath.get(0));
+    }
+    stringBuilder.append("]");
+
+    return stringBuilder.toString();
+  }
+
+
+  /**
+   * Check nested parameters.
+   *
+   * @param callingNestedFileName  the calling nested file name
+   * @param nestedFileName         the nested file name
+   * @param resourceName           the resource name
+   * @param globalContext          the global context
+   * @param resourceFileProperties the resource file properties
+   */
+  public static void checkNestedParameters(String callingNestedFileName, String nestedFileName,
+                                           String resourceName,
+                                           GlobalValidationContext globalContext,
+                                           Set<String> resourceFileProperties) {
+    HeatOrchestrationTemplate heatOrchestrationTemplate;
+    try {
+      heatOrchestrationTemplate = new YamlUtil()
+          .yamlToObject(globalContext.getFileContent(nestedFileName),
+              HeatOrchestrationTemplate.class);
+    } catch (Exception e0) {
+      return;
+    }
+    Set<String> nestedParametersNames = heatOrchestrationTemplate.getParameters() == null ? null
+        : heatOrchestrationTemplate.getParameters().keySet();
+
+    if (CollectionUtils.isNotEmpty(nestedParametersNames)) {
+      resourceFileProperties
+          .stream()
+          .filter(propertyName -> !nestedParametersNames.contains(propertyName))
+          .forEach(propertyName -> globalContext
+              .addMessage(callingNestedFileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+                  .getErrorWithParameters(Messages.MISSING_PARAMETER_IN_NESTED.getErrorMessage(),
+                      nestedFileName, resourceName, propertyName)));
+    }
+  }
+
+
+  /**
+   * Is nested loop exist in file boolean.
+   *
+   * @param callingFileName the calling file name
+   * @param nestedFileName  the nested file name
+   * @param filesInLoop     the files in loop
+   * @param globalContext   the global context
+   * @return the boolean
+   */
+  public static boolean isNestedLoopExistInFile(String callingFileName, String nestedFileName,
+                                                List<String> filesInLoop,
+                                                GlobalValidationContext globalContext) {
+    HeatOrchestrationTemplate nestedHeatOrchestrationTemplate;
+    try {
+      nestedHeatOrchestrationTemplate = new YamlUtil()
+          .yamlToObject(globalContext.getFileContent(nestedFileName),
+              HeatOrchestrationTemplate.class);
+    } catch (Exception e0) {
+      logger.warn("HEAT Validator will not be executed on file " + nestedFileName
+          + " due to illegal HEAT format");
+      return false;
+    }
+    filesInLoop.add(nestedFileName);
+    Collection<Resource> nestedResources =
+        nestedHeatOrchestrationTemplate.getResources() == null ? null
+            : nestedHeatOrchestrationTemplate.getResources().values();
+    if (CollectionUtils.isNotEmpty(nestedResources)) {
+      for (Resource resource : nestedResources) {
+        String resourceType = resource.getType();
+
+        if (Objects.nonNull(resourceType) && isNestedResource(resourceType)) {
+          return resourceType.equals(callingFileName) || !filesInLoop.contains(resourceType)
+              && isNestedLoopExistInFile(callingFileName, resourceType, filesInLoop, globalContext);
+        }
+      }
+    }
+    return false;
+  }
+
+
+  /**
+   * Loop over output map and validate get attr from nested.
+   *
+   * @param fileName                  the file name
+   * @param outputMap                 the output map
+   * @param heatOrchestrationTemplate the heat orchestration template
+   * @param globalContext             the global context
+   */
+  @SuppressWarnings("unchecked")
+  public static void loopOverOutputMapAndValidateGetAttrFromNested(String fileName,
+                                       Map<String, Output> outputMap,
+                                       HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                       GlobalValidationContext globalContext) {
+    for (Output output : outputMap.values()) {
+      Object outputValue = output.getValue();
+      if (outputValue != null && outputValue instanceof Map) {
+        Map<String, Object> outputValueMap = (Map<String, Object>) outputValue;
+        List<String> getAttrValue =
+            (List<String>) outputValueMap.get(ResourceReferenceFunctions.GET_ATTR.getFunction());
+        if (!CollectionUtils.isEmpty(getAttrValue)) {
+          String resourceName = getAttrValue.get(0);
+          String propertyName = getAttrValue.get(1);
+          String resourceType =
+              getResourceTypeFromResourcesMap(resourceName, heatOrchestrationTemplate);
+
+          if (Objects.nonNull(resourceType)
+              && HeatValidationService.isNestedResource(resourceType)) {
+            Map<String, Output> nestedOutputMap;
+            HeatOrchestrationTemplate nestedHeatOrchestrationTemplate;
+            try {
+              nestedHeatOrchestrationTemplate = new YamlUtil()
+                  .yamlToObject(globalContext.getFileContent(resourceType),
+                      HeatOrchestrationTemplate.class);
+            } catch (Exception e0) {
+              return;
+            }
+            nestedOutputMap = nestedHeatOrchestrationTemplate.getOutputs();
+
+            if (MapUtils.isEmpty(nestedOutputMap) || !nestedOutputMap.containsKey(propertyName)) {
+              globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+                  .getErrorWithParameters(Messages.GET_ATTR_NOT_FOUND.getErrorMessage(),
+                      propertyName, resourceName));
+            }
+          }
+        }
+      }
+    }
+  }
+
+
+  public static boolean isNestedResource(String resourceType) {
+    return resourceType.contains(".yaml") || resourceType.contains(".yml");
+  }
+
+
+  private static String getResourceTypeFromResourcesMap(String resourceName,
+                                    HeatOrchestrationTemplate heatOrchestrationTemplate) {
+    return heatOrchestrationTemplate.getResources().get(resourceName).getType();
+  }
+
+  /**
+   * Validate env content environment.
+   *
+   * @param fileName      the file name
+   * @param envFileName   the env file name
+   * @param globalContext the global context
+   * @return the environment
+   */
+  public static Environment validateEnvContent(String fileName, String envFileName,
+                                               GlobalValidationContext globalContext) {
+    Environment envContent = null;
+    try {
+      envContent =
+          new YamlUtil().yamlToObject(globalContext.getFileContent(envFileName), Environment.class);
+    } catch (Exception e0) {
+      return null;
+    }
+    return envContent;
+  }
+
+
+  public static String getResourceGroupResourceName(String resourceCallingToResourceGroup) {
+    return "OS::Heat::ResourceGroup in " + resourceCallingToResourceGroup;
+  }
+
+}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/ResourceValidationHeatValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/ResourceValidationHeatValidator.java
new file mode 100644
index 0000000000..3457bed1e9
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/util/ResourceValidationHeatValidator.java
@@ -0,0 +1,617 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.validation.impl.util;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
+import org.openecomp.core.validation.errors.Messages;
+import org.openecomp.core.validation.types.GlobalValidationContext;
+import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
+import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
+import org.openecomp.sdc.heat.datatypes.model.Output;
+import org.openecomp.sdc.heat.datatypes.model.PolicyTypes;
+import org.openecomp.sdc.heat.datatypes.model.PropertiesMapKeyTypes;
+import org.openecomp.sdc.heat.datatypes.model.Resource;
+import org.openecomp.sdc.heat.datatypes.model.ResourceReferenceFunctions;
+import org.openecomp.sdc.heat.datatypes.model.ResourceTypeToMessageString;
+import org.openecomp.sdc.heat.services.HeatStructureUtil;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+
+public class ResourceValidationHeatValidator {
+
+  /**
+   * Validate resource type.
+   *
+   * @param fileName                               the file name
+   * @param baseFileName                           the base file name
+   * @param securityGroupsNamesFromBaseFileOutputs the security groups names from base file outputs
+   * @param heatOrchestrationTemplate              the heat orchestration template
+   * @param globalContext                          the global context
+   */
+  public static void validateResourceType(String fileName, String baseFileName,
+                                          Set<String> securityGroupsNamesFromBaseFileOutputs,
+                                          HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                          GlobalValidationContext globalContext) {
+    Map<String, Resource> resourceMap =
+        heatOrchestrationTemplate.getResources() == null ? new HashMap<>()
+            : heatOrchestrationTemplate.getResources();
+    Map<String, Integer> numberOfVisitsInPort = new HashMap<>();
+    Set<String> resourcesNames = resourceMap.keySet();
+    Set<String> sharedResourcesFromOutputMap =
+        getSharedResourcesNamesFromOutputs(fileName, heatOrchestrationTemplate.getOutputs(),
+            globalContext);
+    boolean isBaseFile = baseFileName != null && fileName.equals(baseFileName);
+
+    Map<HeatResourcesTypes, List<String>> resourceTypeToNamesListMap = HeatResourcesTypes
+        .getListForResourceType(HeatResourcesTypes.NOVA_SERVER_GROUP_RESOURCE_TYPE,
+            HeatResourcesTypes.NEUTRON_SECURITY_GROUP_RESOURCE_TYPE,
+            HeatResourcesTypes.CONTRAIL_NETWORK_RULE_RESOURCE_TYPE);
+
+    initResourceTypeListWithItsResourcesNames(fileName, resourceTypeToNamesListMap, resourceMap,
+        sharedResourcesFromOutputMap, globalContext);
+    initVisitedPortsMap(fileName, resourceMap, numberOfVisitsInPort, globalContext);
+
+
+    for (Map.Entry<String, Resource> resourceEntry : resourceMap.entrySet()) {
+      String resourceType = resourceEntry.getValue().getType();
+      validateSecurityGroupsFromBaseOutput(fileName, resourceEntry, isBaseFile,
+          securityGroupsNamesFromBaseFileOutputs, globalContext);
+      checkResourceDependsOn(fileName, resourceEntry.getValue(), resourcesNames, globalContext);
+
+      if (Objects.isNull(resourceType)) {
+        globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+            .getErrorWithParameters(Messages.INVALID_RESOURCE_TYPE.getErrorMessage(), "null",
+                resourceEntry.getKey()));
+      } else {
+        HeatResourcesTypes heatResourceType = HeatResourcesTypes.findByHeatResource(resourceType);
+
+        if (heatResourceType != null) {
+          switch (heatResourceType) {
+            case NOVA_SERVER_RESOURCE_TYPE:
+              validateNovaServerResourceType(fileName, resourceEntry, numberOfVisitsInPort,
+                  resourceTypeToNamesListMap
+                      .get(HeatResourcesTypes.NOVA_SERVER_GROUP_RESOURCE_TYPE),
+                  heatOrchestrationTemplate, globalContext);
+              break;
+
+            case NOVA_SERVER_GROUP_RESOURCE_TYPE:
+              validateNovaServerGroupPolicy(fileName, resourceEntry, globalContext);
+              break;
+
+            case RESOURCE_GROUP_RESOURCE_TYPE:
+              validateResourceGroupType(fileName, resourceEntry, globalContext);
+              break;
+
+            case NEUTRON_PORT_RESOURCE_TYPE:
+              validateNeutronPortType(fileName, resourceEntry, resourceTypeToNamesListMap
+                  .get(HeatResourcesTypes.NEUTRON_SECURITY_GROUP_RESOURCE_TYPE), globalContext);
+              break;
+
+            case CONTRAIL_NETWORK_ATTACH_RULE_RESOURCE_TYPE:
+              validateContrailAttachPolicyType(resourceEntry, resourceTypeToNamesListMap
+                  .get(HeatResourcesTypes.CONTRAIL_NETWORK_RULE_RESOURCE_TYPE));
+              break;
+            default:
+          }
+        } else {
+          if (HeatValidationService.isNestedResource(resourceType)) {
+            handleNestedResourceType(fileName, resourceEntry.getKey(), resourceEntry.getValue(),
+                globalContext);
+          }
+        }
+      }
+    }
+
+    checkForEmptyResourceNamesInMap(fileName,
+        CollectionUtils.isEmpty(securityGroupsNamesFromBaseFileOutputs), resourceTypeToNamesListMap,
+        globalContext);
+    handleOrphanPorts(fileName, numberOfVisitsInPort, globalContext);
+  }
+
+
+  private static void validateNovaServerResourceType(String fileName,
+                                                     Map.Entry<String, Resource> resourceEntry,
+                                                     Map<String, Integer> numberOfVisitsInPort,
+                                                     List<String> serverGroupResourcesNames,
+                                                     HeatOrchestrationTemplate
+                                                         heatOrchestrationTemplate,
+                                                     GlobalValidationContext globalContext) {
+    validateAssignedValueForImageOrFlavorFromNova(fileName, resourceEntry, globalContext);
+    validateNovaServerPortBinding(fileName, resourceEntry.getValue(), numberOfVisitsInPort,
+        globalContext);
+    validateAllServerGroupsPointedByServerExistAndDefined(fileName, resourceEntry,
+        serverGroupResourcesNames, heatOrchestrationTemplate, globalContext);
+
+  }
+
+
+  private static void handleNestedResourceType(String fileName, String resourceName,
+                                               Resource resource,
+                                               GlobalValidationContext globalContext) {
+    validateAllPropertiesMatchNestedParameters(fileName, resourceName, resource, globalContext);
+    validateLoopsOfNestingFromFile(fileName, resource.getType(), globalContext);
+  }
+
+
+  private static void validateResourceGroupType(String fileName,
+                                                Map.Entry<String, Resource> resourceEntry,
+                                                GlobalValidationContext globalContext) {
+    Resource resourceDef = HeatStructureUtil
+        .getResourceDef(fileName, resourceEntry.getKey(), resourceEntry.getValue(), globalContext);
+    // validateResourceGroupTypeIsSupported(fileName, resourceEntry.getKey(),resourceDef.getType(),
+    // globalContext);
+    if (resourceDef != null) {
+      if (Objects.nonNull(resourceDef.getType())
+          && HeatValidationService.isNestedResource(resourceDef.getType())) {
+        handleNestedResourceType(fileName, resourceDef.getType(), resourceDef, globalContext);
+      }
+    }
+  }
+
+
+  private static void validateAllPropertiesMatchNestedParameters(String fileName,
+                                                                 String resourceName,
+                                                                 Resource resource,
+                                                                 GlobalValidationContext
+                                                                     globalContext) {
+
+    String resourceType = resource.getType();
+    if (globalContext.getFileContextMap().containsKey(resourceType)) {
+      Set<String> propertiesNames =
+          resource.getProperties() == null ? null : resource.getProperties().keySet();
+      if (CollectionUtils.isNotEmpty(propertiesNames)) {
+        HeatValidationService
+            .checkNestedParameters(fileName, resourceType, resourceName, globalContext,
+                propertiesNames);
+      }
+    } else {
+      globalContext.addMessage(resourceType, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.MISSING_NESTED_FILE.getErrorMessage(), resourceType));
+    }
+  }
+
+
+  private static void validateAssignedValueForImageOrFlavorFromNova(String fileName,
+                                                                    Map.Entry<String, Resource>
+                                                                        resourceEntry,
+                                                                    GlobalValidationContext
+                                                                        globalContext) {
+
+    Resource resource = resourceEntry.getValue();
+    Map<String, Object> propertiesMap = resource.getProperties();
+    if (propertiesMap.get(PropertiesMapKeyTypes.IMAGE.getKeyMap()) == null
+        && propertiesMap.get(PropertiesMapKeyTypes.FLAVOR.getKeyMap()) == null) {
+      globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.MISSING_IMAGE_AND_FLAVOR.getErrorMessage(),
+              resourceEntry.getKey()));
+    }
+  }
+
+
+  private static void validateLoopsOfNestingFromFile(String fileName, String resourceType,
+                                                     GlobalValidationContext globalContext) {
+    List<String> filesInLoop = new ArrayList<>(Collections.singletonList(fileName));
+    if (HeatValidationService
+        .isNestedLoopExistInFile(fileName, resourceType, filesInLoop, globalContext)) {
+      globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.NESTED_LOOP.getErrorMessage(),
+              HeatValidationService.drawFilesLoop(filesInLoop)));
+    }
+  }
+
+
+  /* validation 22*/
+  @SuppressWarnings("unchecked")
+  private static void validateNovaServerPortBinding(String fileName, Resource resource,
+                                                    Map<String, Integer> numberOfVisitsInPort,
+                                                    GlobalValidationContext globalContext) {
+
+    Map<String, Object> propertiesMap = resource.getProperties();
+    List<Object> networksList =
+        (List<Object>) propertiesMap.get(PropertiesMapKeyTypes.NETWORKS.getKeyMap());
+
+    if (CollectionUtils.isNotEmpty(networksList)) {
+      networksList
+          .stream()
+          .filter(networkObject -> networkObject instanceof Map)
+          .forEach(networkObject -> {
+            Map<String, Object> portValueMap =
+                (Map<String, Object>) ((Map) networkObject).get("port");
+            if (MapUtils.isNotEmpty(portValueMap)) {
+              checkPortBindingFromMap(fileName, portValueMap, numberOfVisitsInPort, globalContext);
+            }
+          });
+    }
+  }
+
+  /* validation 23*/
+  @SuppressWarnings("unchecked")
+  private static void validateAllServerGroupsPointedByServerExistAndDefined(String fileName,
+                                              Map.Entry<String, Resource> resourceEntry,
+                                              List<String> serverGroupNamesList,
+                                              HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                              GlobalValidationContext globalContext) {
+    Map<String, Resource> resourcesMap = heatOrchestrationTemplate.getResources();
+
+    Map<String, Object> resourceProperties = resourceEntry.getValue().getProperties();
+    Map<String, Object> schedulerHintsMap = resourceProperties == null ? null
+        : (Map<String, Object>) resourceProperties
+            .get(ResourceReferenceFunctions.SCHEDULER_HINTS.getFunction());
+
+    if (MapUtils.isNotEmpty(schedulerHintsMap)) {
+      for (Object serverGroupMap : schedulerHintsMap.values()) {
+        Map<String, Object> currentServerMap = (Map<String, Object>) serverGroupMap;
+        String serverResourceName = currentServerMap == null ? null
+            : (String) currentServerMap.get(ResourceReferenceFunctions.GET_RESOURCE.getFunction());
+        Resource serverResource = serverResourceName == null || resourcesMap == null ? null
+            : resourcesMap.get(serverResourceName);
+        if (serverResource != null && !serverResource.getType()
+            .equals(HeatResourcesTypes.NOVA_SERVER_GROUP_RESOURCE_TYPE.getHeatResource())) {
+          globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+              .getErrorWithParameters(Messages.SERVER_NOT_DEFINED_FROM_NOVA.getErrorMessage(),
+                  serverResourceName, resourceEntry.getKey()));
+        } else {
+          serverGroupNamesList.remove(serverResourceName);
+        }
+      }
+    }
+  }
+
+
+  /* validation 24*/
+  @SuppressWarnings("unchecked")
+  private static void validateNovaServerGroupPolicy(String fileName,
+                                                    Map.Entry<String, Resource> resourceEntry,
+                                                    GlobalValidationContext globalContext) {
+
+    Resource resource = resourceEntry.getValue();
+    List<String> policiesList = resource.getProperties() == null ? null
+        : (List<String>) resource.getProperties().get("policies");
+
+    if (CollectionUtils.isNotEmpty(policiesList)) {
+      if (policiesList.size() == 1) {
+        String policy = policiesList.get(0);
+        if (!PolicyTypes.isGivenPolicyValid(policy)) {
+          globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+              .getErrorWithParameters(Messages.WRONG_POLICY_IN_SERVER_GROUP.getErrorMessage(),
+                  resourceEntry.getKey()));
+        }
+      } else {
+        globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+            .getErrorWithParameters(Messages.WRONG_POLICY_IN_SERVER_GROUP.getErrorMessage(),
+                resourceEntry.getKey()));
+      }
+    }
+  }
+
+
+  private static void validateNeutronPortType(String filename,
+                                              Map.Entry<String, Resource> resourceEntry,
+                                              List<String> securityGroupResourceNameList,
+                                              GlobalValidationContext globalContext) {
+    validateAllSecurityGroupsAreUsed(filename, resourceEntry, securityGroupResourceNameList,
+        globalContext);
+
+  }
+
+
+  @SuppressWarnings("unchecked")
+  private static void validateAllSecurityGroupsAreUsed(String filename,
+                                                       Map.Entry<String, Resource> resourceEntry,
+                                                       List<String> securityGroupResourceNameList,
+                                                       GlobalValidationContext globalContext) {
+    Map<String, Object> propertiesMap = resourceEntry.getValue().getProperties();
+
+    if (MapUtils.isEmpty(propertiesMap)) {
+      return;
+    }
+
+    Object securityGroupsValue = propertiesMap.get("security_groups");
+
+    if (Objects.isNull(securityGroupsValue)) {
+      return;
+    }
+
+    if (securityGroupsValue instanceof List) {
+      List<Object> securityGroupsListFromCurrResource =
+          (List<Object>) propertiesMap.get("security_groups");
+      for (Object securityGroup : securityGroupsListFromCurrResource) {
+        removeSecurityGroupNamesFromListByGivenFunction(filename,
+            ResourceReferenceFunctions.GET_RESOURCE.getFunction(), securityGroup,
+            securityGroupResourceNameList, globalContext);
+      }
+    }
+  }
+
+
+  private static void validateSecurityGroupsFromBaseOutput(String filename,
+                                                  Map.Entry<String, Resource> resourceEntry,
+                                                  boolean isBaseFile,
+                                                  Set<String> securityGroupNamesFromBaseOutput,
+                                                  GlobalValidationContext globalContext) {
+    if (!isBaseFile && CollectionUtils.isNotEmpty(securityGroupNamesFromBaseOutput)) {
+      Map<String, Object> propertiesMap = resourceEntry.getValue().getProperties();
+
+      if (MapUtils.isEmpty(propertiesMap)) {
+        return;
+      }
+
+      for (Map.Entry<String, Object> propertyEntry : propertiesMap.entrySet()) {
+        removeSecurityGroupNamesFromListByGivenFunction(filename,
+            ResourceReferenceFunctions.GET_PARAM.getFunction(), propertyEntry.getValue(),
+            securityGroupNamesFromBaseOutput, globalContext);
+      }
+    }
+  }
+
+
+  private static void removeSecurityGroupNamesFromListByGivenFunction(String filename,
+                                                                      String functionName,
+                                                                      Object securityGroup,
+                                            Collection<String> securityGroupResourceNameList,
+                                            GlobalValidationContext globalContext) {
+    Set<String> securityGroupsNamesFromFunction = HeatStructureUtil
+        .getReferencedValuesByFunctionName(filename, functionName, securityGroup, globalContext);
+    securityGroupsNamesFromFunction.forEach(securityGroupResourceNameList::remove);
+  }
+
+
+  @SuppressWarnings("unchecked")
+  private static void validateContrailAttachPolicyType(Map.Entry<String, Resource> resourceEntry,
+                                                       List<String> networkPolicyResourceNames) {
+    Map<String, Object> propertiesMap = resourceEntry.getValue().getProperties();
+
+    if (MapUtils.isNotEmpty(propertiesMap)) {
+      Map<String, Object> policyMap = (Map<String, Object>) propertiesMap.get("policy");
+      if (MapUtils.isNotEmpty(policyMap)) {
+        List<Object> securityGroupList =
+            (List<Object>) policyMap.get(ResourceReferenceFunctions.GET_ATTR.getFunction());
+        //noinspection SuspiciousMethodCalls
+        if (CollectionUtils.isNotEmpty(securityGroupList)) {
+          //noinspection SuspiciousMethodCalls
+          networkPolicyResourceNames.remove(securityGroupList.get(0));
+        }
+      }
+    }
+  }
+
+
+  private static void getResourceNamesListFromSpecificResource(String filename,
+                                                               List<String> resourcesNames,
+                                                               HeatResourcesTypes heatResourcesType,
+                                                               Map<String, Resource> resourcesMap,
+                                                       Set<String> sharedResourcesFromOutputMap,
+                                                       GlobalValidationContext globalContext) {
+
+    for (Map.Entry<String, Resource> resourceEntry : resourcesMap.entrySet()) {
+      String resourceType = resourceEntry.getValue().getType();
+      if (Objects.isNull(resourceType)) {
+        globalContext.addMessage(filename, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+            .getErrorWithParameters(Messages.INVALID_RESOURCE_TYPE.getErrorMessage(), null,
+                resourceEntry.getKey()));
+      } else {
+        if (resourceType.equals(heatResourcesType.getHeatResource())
+            && !isSharedResource(resourceEntry.getKey(), sharedResourcesFromOutputMap)) {
+          resourcesNames.add(resourceEntry.getKey());
+        }
+      }
+    }
+  }
+
+
+  private static boolean isSharedResource(String resourceName,
+                                          Set<String> sharedResourcesFromOutputMap) {
+    return !CollectionUtils.isEmpty(sharedResourcesFromOutputMap)
+        && sharedResourcesFromOutputMap.contains(resourceName);
+  }
+
+  /**
+   * Handle not empty resource names list.
+   *
+   * @param fileName              the file name
+   * @param resourcesNameList     the resources name list
+   * @param securityOrServerGroup the security or server group
+   * @param globalContext         the global context
+   */
+  public static void handleNotEmptyResourceNamesList(String fileName,
+                                                     Collection<String> resourcesNameList,
+                                                     String securityOrServerGroup,
+                                                     GlobalValidationContext globalContext) {
+    if (CollectionUtils.isNotEmpty(resourcesNameList)) {
+      resourcesNameList.forEach(name ->
+          globalContext
+              .addMessage(
+                  fileName,
+                  ErrorLevel.WARNING,
+                  ErrorMessagesFormatBuilder
+                      .getErrorWithParameters(
+                          Messages.SERVER_OR_SECURITY_GROUP_NOT_IN_USE.getErrorMessage(),
+                          securityOrServerGroup, name)));
+    }
+  }
+
+
+  private static void initVisitedPortsMap(String filename, Map<String, Resource> resourceMap,
+                                          Map<String, Integer> numberOfVisitsInPort,
+                                          GlobalValidationContext globalContext) {
+    for (Map.Entry<String, Resource> resourceEntry : resourceMap.entrySet()) {
+      String resourceType = resourceEntry.getValue().getType();
+
+      if (Objects.isNull(resourceType)) {
+        globalContext.addMessage(filename, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+            .getErrorWithParameters(Messages.INVALID_RESOURCE_TYPE.getErrorMessage(), "null",
+                resourceEntry.getKey()));
+      } else {
+        if (resourceType.equals(HeatResourcesTypes.NEUTRON_PORT_RESOURCE_TYPE.getHeatResource())) {
+          numberOfVisitsInPort.put(resourceEntry.getKey(), 0);
+        }
+      }
+    }
+  }
+
+  private static boolean checkIfPortWasVisited(String resourcePortName,
+                                               Map<String, Integer> numberOfVisitsInPort) {
+    return numberOfVisitsInPort.containsKey(resourcePortName)
+        && numberOfVisitsInPort.get(resourcePortName) == 1;
+  }
+
+
+  private static void incrementNumberOfVisitsInPort(String resourcePortName,
+                                                    Map<String, Integer> numberOfVisitsInPort) {
+    if (numberOfVisitsInPort.containsKey(resourcePortName)) {
+      numberOfVisitsInPort.put(resourcePortName, numberOfVisitsInPort.get(resourcePortName) + 1);
+    }
+  }
+
+
+  private static void handleOrphanPorts(String fileName, Map<String, Integer> numberOfVisitsInPort,
+                                        GlobalValidationContext globalContext) {
+    numberOfVisitsInPort
+        .entrySet()
+        .stream()
+        .filter(entry -> entry.getValue() == 0)
+        .forEach(entry ->
+            globalContext
+                .addMessage(
+                    fileName,
+                    ErrorLevel.WARNING,
+                    ErrorMessagesFormatBuilder
+                        .getErrorWithParameters(
+                            Messages.PORT_NO_BIND_TO_ANY_NOVA_SERVER.getErrorMessage(),
+                            entry.getKey())));
+  }
+
+  @SuppressWarnings("unchecked")
+  private static void checkResourceDependsOn(String fileName, Resource resource,
+                                             Set<String> resourcesNames,
+                                             GlobalValidationContext globalContext) {
+    Object dependencies = resource.getDepends_on();
+    if (dependencies instanceof Collection) {
+      ((Collection<String>) dependencies)
+          .stream()
+          .filter(resource_id -> !resourcesNames.contains(resource_id))
+          .forEach(resource_id -> globalContext.addMessage(fileName, ErrorLevel.ERROR,
+              ErrorMessagesFormatBuilder
+                  .getErrorWithParameters(Messages.MISSING_RESOURCE_IN_DEPENDS_ON.getErrorMessage(),
+                      (String) resource_id)));
+    } else if (dependencies instanceof String) {
+      if (!resourcesNames.contains(dependencies)) {
+        globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+            .getErrorWithParameters(Messages.MISSING_RESOURCE_IN_DEPENDS_ON.getErrorMessage(),
+                (String) dependencies));
+      }
+    }
+  }
+
+
+  private static void checkPortBindingFromMap(String fileName, Map<String, Object> portValueMap,
+                                              Map<String, Integer> numberOfVisitsInPort,
+                                              GlobalValidationContext globalContext) {
+    String resourcePortName =
+        (String) portValueMap.get(ResourceReferenceFunctions.GET_RESOURCE.getFunction());
+    if (checkIfPortWasVisited(resourcePortName, numberOfVisitsInPort)) {
+      globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.MORE_THAN_ONE_BIND_FROM_NOVA_TO_PORT.getErrorMessage(),
+              (String) portValueMap.get(ResourceReferenceFunctions.GET_RESOURCE.getFunction())));
+    } else {
+      incrementNumberOfVisitsInPort(resourcePortName, numberOfVisitsInPort);
+    }
+  }
+
+
+  private static void initResourceTypeListWithItsResourcesNames(String filename,
+                                       Map<HeatResourcesTypes, List<String>> resourcesTypesListMap,
+                                       Map<String, Resource> resourcesMap,
+                                       Set<String> sharedResourcesFromOutputsMap,
+                                       GlobalValidationContext globalContext) {
+    for (Map.Entry<HeatResourcesTypes, List<String>> resourcesTypesToListEntry
+        : resourcesTypesListMap.entrySet()) {
+      HeatResourcesTypes currentType = resourcesTypesToListEntry.getKey();
+      List<String> currNamesList = new ArrayList<>();
+      getResourceNamesListFromSpecificResource(filename, currNamesList, currentType, resourcesMap,
+          sharedResourcesFromOutputsMap, globalContext);
+      resourcesTypesListMap.put(currentType, currNamesList);
+    }
+  }
+
+
+  private static void checkForEmptyResourceNamesInMap(String fileName,
+                                        boolean isBaseFileContainPorts,
+                                        Map<HeatResourcesTypes, List<String>> resourcesTypesListMap,
+                                        GlobalValidationContext globalContext) {
+    if (isBaseFileContainPorts) {
+      for (Map.Entry<HeatResourcesTypes, List<String>> resourcesTypesListEntry
+          : resourcesTypesListMap.entrySet()) {
+        handleNotEmptyResourceNamesList(fileName, resourcesTypesListEntry.getValue(),
+            ResourceTypeToMessageString
+                .getTypeForMessageFromResourceType(resourcesTypesListEntry.getKey()),
+            globalContext);
+      }
+    }
+  }
+
+
+  private static Set<String> getSharedResourcesNamesFromOutputs(String filename,
+                                                  Map<String, Output> outputsMap,
+                                                  GlobalValidationContext globalContext) {
+    Set<String> sharedResources = new HashSet<>();
+
+    if (MapUtils.isEmpty(outputsMap)) {
+      return null;
+    }
+
+    for (Map.Entry<String, Output> outputEntry : outputsMap.entrySet()) {
+      Output output = outputEntry.getValue();
+      Object valueObject = output.getValue();
+      if (valueObject instanceof Map) {
+        Map<String, Object> outputValueMap = (Map<String, Object>) valueObject;
+        Object getResourceValue =
+            outputValueMap.get(ResourceReferenceFunctions.GET_RESOURCE.getFunction());
+        if (Objects.nonNull(getResourceValue)) {
+          if (getResourceValue instanceof String) {
+            String resourceName =
+                (String) outputValueMap.get(ResourceReferenceFunctions.GET_RESOURCE.getFunction());
+            sharedResources.add(resourceName);
+          } else {
+            globalContext.addMessage(filename, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+                .getErrorWithParameters(Messages.INVALID_GET_RESOURCE_SYNTAX.getErrorMessage(),
+                    getResourceValue.toString()));
+          }
+        }
+
+      }
+    }
+
+    return sharedResources;
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/EcompGuideLineValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/EcompGuideLineValidator.java
new file mode 100644
index 0000000000..5be56e4b38
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/EcompGuideLineValidator.java
@@ -0,0 +1,784 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.validation.impl.validators;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.openecomp.core.utilities.CommonMethods;
+import org.openecomp.core.utilities.yaml.YamlUtil;
+import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
+import org.openecomp.core.validation.errors.Messages;
+import org.openecomp.core.validation.interfaces.Validator;
+import org.openecomp.core.validation.types.GlobalValidationContext;
+import org.openecomp.sdc.common.utils.AsdcCommon;
+import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.datatypes.model.heat.ForbiddenHeatResourceTypes;
+import org.openecomp.sdc.heat.datatypes.DefinedHeatParameterTypes;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData;
+import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
+import org.openecomp.sdc.heat.datatypes.model.Environment;
+import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
+import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
+import org.openecomp.sdc.heat.datatypes.model.Resource;
+import org.openecomp.sdc.heat.datatypes.model.ResourceReferenceFunctions;
+import org.openecomp.sdc.heat.services.HeatStructureUtil;
+import org.openecomp.sdc.heat.services.manifest.ManifestUtil;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.regex.Pattern;
+
+public class EcompGuideLineValidator extends HeatValidator implements Validator {
+  @Override
+  public void validate(GlobalValidationContext globalContext) {
+
+    ManifestContent manifestContent;
+    try {
+      manifestContent = checkValidationPreCondition(globalContext);
+    } catch (Exception exception) {
+      return;
+    }
+
+    //global validations
+    Set<String> baseFiles = validateManifest(manifestContent, globalContext);
+
+    Map<String, FileData.Type> fileTypeMap = ManifestUtil.getFileTypeMap(manifestContent);
+    Map<String, FileData> fileEnvMap = ManifestUtil.getFileAndItsEnv(manifestContent);
+    globalContext
+        .getFiles()
+        .stream()
+        .filter(fileName -> FileData
+            .isHeatFile(fileTypeMap.get(fileName)))
+        .forEach(fileName -> validate(fileName,
+            fileEnvMap.get(fileName) != null ? fileEnvMap.get(fileName).getFile() : null,
+            fileTypeMap, baseFiles, globalContext));
+  }
+
+  private void validate(String fileName, String envFileName, Map<String, FileData.Type> fileTypeMap,
+                        Set<String> baseFiles, GlobalValidationContext globalContext) {
+    HeatOrchestrationTemplate heatOrchestrationTemplate =
+        checkHeatOrchestrationPreCondition(fileName, globalContext);
+    if (heatOrchestrationTemplate == null) {
+      return;
+    }
+
+    validateBaseFile(fileName, baseFiles, heatOrchestrationTemplate, globalContext);
+    validateHeatVolumeFile(fileName, fileTypeMap, heatOrchestrationTemplate, globalContext);
+    validateHeatNamingConvention(fileName, heatOrchestrationTemplate, globalContext);
+    validateHeatNovaResource(fileName, envFileName, heatOrchestrationTemplate, globalContext);
+    validateResourceTypeIsForbidden(fileName, heatOrchestrationTemplate, globalContext);
+    validateFixedIpsNamingConvention(fileName, heatOrchestrationTemplate, globalContext);
+  }
+
+  private void validateHeatNovaResource(String fileName, String envFileName,
+                                        HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                        GlobalValidationContext globalContext) {
+    Map<String, String> uniqueResourcePortNetworkRole = new HashMap<>();
+    //if no resources exist return
+    if (heatOrchestrationTemplate.getResources() == null
+        || heatOrchestrationTemplate.getResources().size() == 0) {
+      return;
+    }
+
+    heatOrchestrationTemplate
+        .getResources()
+        .entrySet()
+        .stream()
+        .filter(entry -> entry.getValue().getType()
+            .equals(HeatResourcesTypes.NOVA_SERVER_RESOURCE_TYPE.getHeatResource()))
+        .forEach(entry -> validateNovaServerResourceType(entry.getKey(), fileName, envFileName,
+            entry, uniqueResourcePortNetworkRole, heatOrchestrationTemplate, globalContext));
+  }
+
+  private void validateNovaServerResourceType(String resourceId, String fileName,
+                                              String envFileName,
+                                              Map.Entry<String, Resource> resourceEntry,
+                                              Map<String, String> uniqueResourcePortNetworkRole,
+                                              HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                              GlobalValidationContext globalValidationContext) {
+    validateNovaServerResourceMetaData(fileName, resourceId,
+        heatOrchestrationTemplate.getResources().get(resourceId), globalValidationContext);
+    validateNovaServerResourceNetworkUniqueRole(fileName, resourceId, heatOrchestrationTemplate,
+        globalValidationContext);
+    validateNovaServerNamingConvention(fileName, envFileName, resourceEntry,
+        globalValidationContext);
+    validateNovaServerAvailabilityZoneName(fileName, resourceEntry, globalValidationContext);
+    validateImageAndFlavorFromNovaServer(fileName, resourceEntry, globalValidationContext);
+  }
+
+  @SuppressWarnings("unchecked")
+  private void validateNovaServerResourceMetaData(String fileName, String resourceId,
+                                                  Resource resource,
+                                                  GlobalValidationContext globalValidationContext) {
+    Map<String, Object> novaServerProp = resource.getProperties();
+    Object novaServerPropMetadata;
+    if (MapUtils.isNotEmpty(novaServerProp)) {
+      novaServerPropMetadata = novaServerProp.get("metadata");
+      if (novaServerPropMetadata == null) {
+        globalValidationContext.addMessage(
+            fileName,
+            ErrorLevel.WARNING,
+            ErrorMessagesFormatBuilder
+                .getErrorWithParameters(Messages.MISSING_NOVA_SERVER_METADATA.getErrorMessage(),
+                    resourceId));
+      } else if (novaServerPropMetadata instanceof Map) {
+        TreeMap<String, Object> propertyMap = new TreeMap(new Comparator<String>() {
+
+          @Override
+          public int compare(String o1, String o2) {
+            return o1.compareToIgnoreCase(o2);
+          }
+
+          @Override
+          public boolean equals(Object obj) {
+            return false;
+          }
+        });
+        propertyMap.putAll((Map) novaServerPropMetadata);
+        if (!propertyMap.containsKey("vf_module_id")) {
+          globalValidationContext.addMessage(fileName, ErrorLevel.WARNING,
+              ErrorMessagesFormatBuilder.getErrorWithParameters(
+                  Messages.MISSING_NOVA_SERVER_VF_MODULE_ID.getErrorMessage(), resourceId));
+        }
+        if (!propertyMap.containsKey("vnf_id")) {
+          globalValidationContext.addMessage(fileName, ErrorLevel.WARNING,
+              ErrorMessagesFormatBuilder
+                  .getErrorWithParameters(Messages.MISSING_NOVA_SERVER_VNF_ID.getErrorMessage(),
+                      resourceId));
+        }
+      }
+    }
+  }
+
+  private void validateNovaServerResourceNetworkUniqueRole(String fileName, String resourceId,
+                                                           HeatOrchestrationTemplate
+                                                               heatOrchestrationTemplate,
+                                                           GlobalValidationContext
+                                                               globalValidationContext) {
+
+    String network;
+    String role;
+    Map<String, String> uniqueResourcePortNetworkRole = new HashMap<>();
+
+    Object propertyNetworkValue =
+        heatOrchestrationTemplate.getResources().get(resourceId).getProperties().get("networks");
+    if (propertyNetworkValue != null && propertyNetworkValue instanceof List) {
+      List<String> portResourceIdList =
+          getNovaNetworkPortResourceList(fileName, (List) propertyNetworkValue,
+              globalValidationContext);
+      for (String portResourceId : portResourceIdList) {
+        Resource portResource = heatOrchestrationTemplate.getResources().get(portResourceId);
+        if (portResource != null && portResource.getType()
+            .equals(HeatResourcesTypes.NEUTRON_PORT_RESOURCE_TYPE.getHeatResource())) {
+          Map portNetwork =
+              getPortNetwork(fileName, resourceId, portResource, globalValidationContext);
+          if (Objects.nonNull(portNetwork)) {
+            network = (String) portNetwork.get("get_param");
+            if (Objects.nonNull(network)) {
+              role = getNetworkRole(network);
+              if (role != null && uniqueResourcePortNetworkRole.containsKey(role)) {
+                globalValidationContext.addMessage(fileName, ErrorLevel.WARNING,
+                    ErrorMessagesFormatBuilder.getErrorWithParameters(
+                        Messages.RESOURCE_CONNECTED_TO_TWO_EXTERNAL_NETWORKS_WITH_SAME_ROLE
+                            .getErrorMessage(), resourceId, role));
+              } else {
+                uniqueResourcePortNetworkRole.put(role, portResourceId);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+
+  private Map getPortNetwork(String fileName, String resourceId, Resource portResource,
+                             GlobalValidationContext globalValidationContext) {
+    Object portNetwork = portResource.getProperties().get("network_id");
+    if (portNetwork == null) {
+      portNetwork = portResource.getProperties().get("network");
+    }
+    if (!(portNetwork instanceof Map)) {
+      globalValidationContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.MISSING_GET_PARAM.getErrorMessage(),
+              "network or network_id", resourceId));
+      return null;
+    }
+    return (Map) portNetwork;
+  }
+
+  private List<String> getNovaNetworkPortResourceList(String filename, List propertyNetworkValue,
+                                                      GlobalValidationContext globalContext) {
+    List<String> portResourceIdList = new ArrayList<>();
+    for (Object propValue : propertyNetworkValue) {
+      Object portPropValue = ((Map) propValue).get("port");
+      Collection<String> portResourceIds = HeatStructureUtil
+          .getReferencedValuesByFunctionName(filename, "get_resource", portPropValue,
+              globalContext);
+      if (portResourceIds != null) {
+        portResourceIdList.addAll(portResourceIds);
+      }
+    }
+
+    return portResourceIdList;
+  }
+
+  private String getNetworkRole(String network) {
+    if (network == null) {
+      return null;
+    }
+    if (network.contains("_net_id")) {
+      return network.substring(0, network.indexOf("_net_id"));
+    } else if (network.contains("net_name")) {
+      return network.substring(0, network.indexOf("_net_name"));
+    } else if (network.contains("net_fqdn")) {
+      return network.substring(0, network.indexOf("_net_fqdn"));
+    }
+    return null;
+  }
+
+  private void validateHeatNamingConvention(String fileName,
+                                            HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                            GlobalValidationContext globalContext) {
+    validatePortNetworkNamingConvention(fileName, heatOrchestrationTemplate, globalContext);
+  }
+
+  private void validatePortNetworkNamingConvention(String fileName,
+                                                   HeatOrchestrationTemplate
+                                                       heatOrchestrationTemplate,
+                                                   GlobalValidationContext globalContext) {
+    if (MapUtils.isEmpty(heatOrchestrationTemplate.getResources())) {
+      return;
+    }
+    String[] regexList = new String[]{".*_net_id", ".*_net_name", ".*_net_fqdn"};
+
+    heatOrchestrationTemplate
+        .getResources()
+        .entrySet()
+        .stream()
+        .filter(entry -> entry.getValue().getType() != null && entry.getValue().getType()
+            .equals(HeatResourcesTypes.NEUTRON_PORT_RESOURCE_TYPE.getHeatResource()))
+        .forEach(entry -> entry.getValue()
+            .getProperties()
+            .entrySet()
+            .stream()
+            .filter(propertyEntry -> propertyEntry != null
+                && (propertyEntry.getKey().toLowerCase().equals("network".toLowerCase())
+                ||
+                propertyEntry.getKey().equals("network_id")))
+            .forEach(propertyEntry -> validateParamNamingConvention(fileName, entry.getKey(),
+                propertyEntry.getValue(), regexList,
+                Messages.NETWORK_PARAM_NOT_ALIGNED_WITH_GUIDE_LINE, globalContext)));
+  }
+
+  private void validateParamNamingConvention(String fileName, String resourceId,
+                                             Object propertyValue, String[] regexList,
+                                             Messages message,
+                                             GlobalValidationContext globalContext) {
+    Object paramName;
+    if (propertyValue instanceof Map) {
+      paramName = ((Map) propertyValue).get("get_param");
+      if (paramName instanceof String) {
+        if (!evalPattern((String) paramName, regexList)) {
+          globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+              .getErrorWithParameters(message.getErrorMessage(), (String) paramName, resourceId));
+        }
+      }
+    } else {
+      globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.MISSING_GET_PARAM.getErrorMessage(),
+              "network or network_id", resourceId));
+    }
+  }
+
+  private boolean evalPattern(Object paramVal, String[] regexList) {
+    String value = "";
+    if (paramVal instanceof String) {
+      value = ((String) paramVal);
+    }
+    if (paramVal instanceof Integer) {
+      value = paramVal.toString();
+    }
+    return evalPattern(value, regexList);
+  }
+
+  private boolean evalPattern(String paramVal, String[] regexList) {
+
+    for (String regex : regexList) {
+      if (Pattern.matches(regex, paramVal)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+
+  private void validateHeatVolumeFile(String fileName, Map<String, FileData.Type> fileTypeMap,
+                                      HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                      GlobalValidationContext globalContext) {
+    //if not heat volume return
+    if (!fileTypeMap.get(fileName).equals(FileData.Type.HEAT_VOL)) {
+      return;
+    }
+
+    //if no resources exist return
+    if (heatOrchestrationTemplate.getResources() == null
+        || heatOrchestrationTemplate.getResources().size() == 0) {
+      return;
+    }
+
+    Set<String> expectedExposedResources = new HashSet<>();
+    Set<String> actualExposedResources = new HashSet<>();
+    heatOrchestrationTemplate.getResources()
+        .entrySet()
+        .stream()
+        .filter(entry -> entry.getValue().getType()
+            .equals(HeatResourcesTypes.CINDER_VOLUME_RESOURCE_TYPE.getHeatResource()))
+        .forEach(entry -> expectedExposedResources.add(entry.getKey()));
+
+    if (heatOrchestrationTemplate.getOutputs() != null) {
+
+      heatOrchestrationTemplate.getOutputs().entrySet()
+          .stream()
+          .filter(entry -> isPropertyValueGetResource(fileName, entry.getValue().getValue(),
+              globalContext))
+          .forEach(entry -> actualExposedResources.add(
+              getResourceIdFromPropertyValue(fileName, entry.getValue().getValue(),
+                  globalContext)));
+    }
+
+    actualExposedResources.stream().forEach(expectedExposedResources::remove);
+
+    if (expectedExposedResources.size() > 0) {
+      expectedExposedResources
+          .stream()
+          .forEach(name -> globalContext.addMessage(fileName, ErrorLevel.WARNING,
+              ErrorMessagesFormatBuilder
+                  .getErrorWithParameters(Messages.VOLUME_HEAT_NOT_EXPOSED.getErrorMessage(),
+                      name)));
+    }
+  }
+
+  private void validateBaseFile(String fileName, Set<String> baseFiles,
+                                HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                GlobalValidationContext globalContext) {
+
+    //if not base return
+    if (baseFiles == null || !baseFiles.contains(fileName)) {
+      return;
+    }
+
+    //if no resources exist return
+    if (heatOrchestrationTemplate.getResources() == null
+        || heatOrchestrationTemplate.getResources().size() == 0) {
+      return;
+    }
+
+    Set<String> expectedExposedResources = new HashSet<>();
+    Set<String> actualExposedResources = new HashSet<>();
+    heatOrchestrationTemplate.getResources()
+        .entrySet()
+        .stream()
+        .filter(entry -> isExpectedToBeExposed(entry.getValue().getType()))
+        .forEach(entry -> expectedExposedResources.add(entry.getKey()));
+
+    if (heatOrchestrationTemplate.getOutputs() != null) {
+
+      heatOrchestrationTemplate.getOutputs().entrySet()
+          .stream()
+          .filter(entry -> isPropertyValueGetResource(fileName, entry.getValue().getValue(),
+              globalContext))
+          .forEach(entry -> actualExposedResources.add(
+              getResourceIdFromPropertyValue(fileName, entry.getValue().getValue(),
+                  globalContext)));
+    }
+    actualExposedResources.stream().forEach(expectedExposedResources::remove);
+
+    if (expectedExposedResources.size() > 0) {
+      expectedExposedResources
+          .stream()
+          .forEach(name -> globalContext.addMessage(fileName, ErrorLevel.WARNING,
+              ErrorMessagesFormatBuilder
+                  .getErrorWithParameters(Messages.RESOURCE_NOT_DEFINED_IN_OUTPUT.getErrorMessage(),
+                      name)));
+    }
+  }
+
+  private void validateResourceTypeIsForbidden(String fileName,
+                                               HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                               GlobalValidationContext globalContext) {
+    if (MapUtils.isEmpty(heatOrchestrationTemplate.getResources())) {
+      return;
+    }
+
+    heatOrchestrationTemplate.getResources()
+        .entrySet()
+        .stream()
+        .filter(entry ->
+            ForbiddenHeatResourceTypes.findByForbiddenHeatResource(entry.getValue().getType())
+                != null)
+        .filter(entry -> ForbiddenHeatResourceTypes
+            .findByForbiddenHeatResource(entry.getValue().getType())
+            .equals(ForbiddenHeatResourceTypes.HEAT_FLOATING_IP_TYPE))
+        .forEach(entry -> globalContext.addMessage(fileName, ErrorLevel.WARNING,
+            ErrorMessagesFormatBuilder
+                .getErrorWithParameters(Messages.FLOATING_IP_NOT_IN_USE.getErrorMessage(),
+                    entry.getKey())));
+  }
+
+
+  private void validateFixedIpsNamingConvention(String fileName,
+                                                HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                                GlobalValidationContext globalContext) {
+    if (MapUtils.isEmpty(heatOrchestrationTemplate.getResources())) {
+      return;
+    }
+
+    heatOrchestrationTemplate.getResources()
+        .entrySet()
+        .stream()
+        .filter(entry -> HeatResourcesTypes.findByHeatResource(entry.getValue().getType()) != null)
+        .filter(entry -> HeatResourcesTypes.findByHeatResource(entry.getValue().getType())
+            .equals(HeatResourcesTypes.NEUTRON_PORT_RESOURCE_TYPE))
+        .forEach(entry -> checkNeutronPortFixedIpsName(fileName, entry, globalContext));
+  }
+
+  private void validateImageAndFlavorFromNovaServer(String fileName,
+                                                    Map.Entry<String, Resource> resourceEntry,
+                                                    GlobalValidationContext globalContext) {
+    if (MapUtils.isEmpty(resourceEntry.getValue().getProperties())) {
+      return;
+    }
+
+    String[] imageOrFlavorAsParameters = new String[]{"image", "flavor"};
+    Map<String, Object> propertiesMap = resourceEntry.getValue().getProperties();
+
+    for (String imageOrFlavor : imageOrFlavorAsParameters) {
+      checkImageAndFlavorNames(fileName, imageOrFlavor, resourceEntry.getKey(), propertiesMap,
+          globalContext);
+    }
+  }
+
+  private void checkImageAndFlavorNames(String fileName, String imageOrFlavor, String resourceId,
+                                        Map<String, Object> propertiesMap,
+                                        GlobalValidationContext globalContext) {
+    Object nameValue =
+        propertiesMap.get(imageOrFlavor) == null ? null : propertiesMap.get(imageOrFlavor);
+    String[] regexList = new String[]{".*_" + imageOrFlavor + "_name"};
+
+    if (Objects.nonNull(nameValue)) {
+      if (nameValue instanceof Map) {
+        String imageOrFlavorName = getWantedNameFromPropertyValueGetParam(nameValue);
+        if (Objects.nonNull(imageOrFlavorName)) {
+          if (!evalPattern(imageOrFlavorName, regexList)) {
+            globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+                .getErrorWithParameters(
+                    Messages.WRONG_IMAGE_OR_FLAVOR_NAME_NOVA_SERVER.getErrorMessage(),
+                    imageOrFlavor, resourceId));
+          }
+        }
+      } else {
+        globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+            .getErrorWithParameters(Messages.MISSING_GET_PARAM.getErrorMessage(), imageOrFlavor,
+                resourceId));
+      }
+    }
+  }
+
+
+  @SuppressWarnings("unchecked")
+  private void checkNeutronPortFixedIpsName(String fileName,
+                                            Map.Entry<String, Resource> resourceEntry,
+                                            GlobalValidationContext globalContext) {
+    String[] regexList =
+        new String[]{"[^_]+_[^_]+_ips", "[^_]+_[^_]+_v6_ips", "[^_]+_[^_]+_ip_(\\d+)",
+            "[^_]+_[^_]+_v6_ip_(\\d+)"};
+
+    if (MapUtils.isEmpty(resourceEntry.getValue().getProperties())) {
+      return;
+    }
+
+    Map<String, Object> propertiesMap = resourceEntry.getValue().getProperties();
+    Object fixedIps = propertiesMap.get("fixed_ips");
+    if (Objects.nonNull(fixedIps) && fixedIps instanceof List) {
+      List<Object> fixedIpsList = (List<Object>) fixedIps;
+      for (Object fixedIpsObject : fixedIpsList) {
+        Map.Entry<String, Object> fixedIpsEntry =
+            ((Map<String, Object>) fixedIpsObject).entrySet().iterator().next();
+        if (Objects.nonNull(fixedIpsEntry)) {
+          if (fixedIpsEntry.getValue() instanceof Map) {
+            String fixedIpsName = getWantedNameFromPropertyValueGetParam(fixedIpsEntry.getValue());
+            if (Objects.nonNull(fixedIpsName)) {
+              if (!evalPattern(fixedIpsName, regexList)) {
+                globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+                    .getErrorWithParameters(
+                        Messages.FIXED_IPS_NOT_ALIGNED_WITH_GUIDE_LINES.getErrorMessage(),
+                        resourceEntry.getKey()));
+              }
+            }
+          } else {
+            globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+                .getErrorWithParameters(Messages.MISSING_GET_PARAM.getErrorMessage(), "fixed_ips",
+                    resourceEntry.getKey()));
+          }
+        }
+      }
+    }
+  }
+
+
+  private void validateNovaServerNamingConvention(String fileName, String envFileName,
+                                                  Map.Entry<String, Resource> resourceEntry,
+                                                  GlobalValidationContext globalContext) {
+    if (MapUtils.isEmpty(resourceEntry.getValue().getProperties())) {
+      return;
+    }
+
+    checkIfNovaNameByGuidelines(fileName, envFileName, resourceEntry, globalContext);
+  }
+
+  private void checkIfNovaNameByGuidelines(String fileName, String envFileName,
+                                           Map.Entry<String, Resource> resourceEntry,
+                                           GlobalValidationContext globalContext) {
+    if (MapUtils.isEmpty(resourceEntry.getValue().getProperties())) {
+      return;
+    }
+
+    Object novaServerName = resourceEntry.getValue().getProperties().get("name");
+    Map novaNameMap;
+    String novaName;
+    if (Objects.nonNull(novaServerName)) {
+      if (novaServerName instanceof Map) {
+        novaNameMap = (Map) novaServerName;
+        Object novaNameGetParam =
+            novaNameMap.get(ResourceReferenceFunctions.GET_PARAM.getFunction()) == null ? null
+                : novaNameMap.get(ResourceReferenceFunctions.GET_PARAM.getFunction());
+        if (Objects.nonNull(novaNameGetParam)) {
+          checkNovaNameGetParamValueMap(fileName, novaNameGetParam, resourceEntry, globalContext);
+          novaName = novaNameGetParam instanceof List ? (String) ((List) novaNameGetParam).get(0)
+              : (String) novaNameGetParam;
+          checkIfNovaNameParameterInEnvIsStringOrList(fileName, envFileName, resourceEntry,
+              novaName, globalContext);
+        }
+      } else {
+        globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+            .getErrorWithParameters(Messages.MISSING_GET_PARAM.getErrorMessage(),
+                "nova server name", resourceEntry.getKey()));
+      }
+    }
+
+  }
+
+  private void checkIfNovaNameParameterInEnvIsStringOrList(String fileName, String envFileName,
+                                                           Map.Entry<String, Resource>
+                                                               resourceEntry,
+                                                           String novaServerName,
+                                                           GlobalValidationContext globalContext) {
+    if (Objects.nonNull(envFileName)) {
+      Environment environment = validateEnvContent(envFileName, globalContext);
+
+      if (environment != null && MapUtils.isNotEmpty(environment.getParameters())) {
+        Object novaServerNameEnvValue =
+            environment.getParameters().containsKey(novaServerName) ? environment.getParameters()
+                .get(novaServerName) : null;
+        if (Objects.nonNull(novaServerNameEnvValue)) {
+          if (!DefinedHeatParameterTypes
+              .isNovaServerEnvValueIsFromRightType(novaServerNameEnvValue)) {
+            globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+                .getErrorWithParameters(
+                    Messages.NOVA_SERVER_NAME_NOT_ALIGNED_WITH_GUIDE_LINES.getErrorMessage(),
+                    resourceEntry.getKey()));
+          }
+        }
+      }
+    }
+  }
+
+
+  private void validateNovaServerAvailabilityZoneName(String fileName,
+                                                      Map.Entry<String, Resource> resourceEntry,
+                                                      GlobalValidationContext globalContext) {
+    String[] regexList = new String[]{"availability_zone_(\\d+)"};
+
+    if (MapUtils.isEmpty(resourceEntry.getValue().getProperties())) {
+      return;
+    }
+
+    Object availabilityZoneMap =
+        resourceEntry.getValue().getProperties().containsKey("availability_zone") ? resourceEntry
+            .getValue().getProperties().get("availability_zone") : null;
+
+    if (Objects.nonNull(availabilityZoneMap)) {
+      if (availabilityZoneMap instanceof Map) {
+        String availabilityZoneName = getWantedNameFromPropertyValueGetParam(availabilityZoneMap);
+
+        if (availabilityZoneName != null) {
+          if (!evalPattern(availabilityZoneName, regexList)) {
+            globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+                .getErrorWithParameters(
+                    Messages.AVAILABILITY_ZONE_NOT_ALIGNED_WITH_GUIDE_LINES.getErrorMessage(),
+                    resourceEntry.getKey()));
+          }
+        }
+      } else {
+        globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+            .getErrorWithParameters(Messages.MISSING_GET_PARAM.getErrorMessage(),
+                "availability_zone", resourceEntry.getKey()));
+      }
+    }
+
+  }
+
+  @SuppressWarnings("unchecked")
+  private void checkNovaNameGetParamValueMap(String fileName, Object getParamValue,
+                                             Map.Entry<String, Resource> resourceEntry,
+                                             GlobalValidationContext globalContext) {
+    if (getParamValue instanceof List) {
+      List<Object> getParamNameList = (List) getParamValue;
+      String[] regexName = new String[]{".*_names"};
+      isNovaNameAsListLegal(fileName, getParamNameList, regexName, resourceEntry, globalContext);
+    } else if (getParamValue instanceof String) {
+      String[] regexName = new String[]{".*_name_(\\d+)"};
+      isNovaNameAsStringLegal(fileName, (String) getParamValue, regexName, resourceEntry,
+          globalContext);
+    }
+
+  }
+
+
+  private void isNovaNameAsListLegal(String fileName, List<Object> getParamNameList,
+                                     String[] regexName, Map.Entry<String, Resource> resourceEntry,
+                                     GlobalValidationContext globalContext) {
+
+    if (getParamNameList.size() != 2 || !evalPattern(getParamNameList.get(0), regexName)) {
+      globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(
+              Messages.NOVA_SERVER_NAME_NOT_ALIGNED_WITH_GUIDE_LINES.getErrorMessage(),
+              resourceEntry.getKey()));
+    }
+  }
+
+  private boolean isNovaNameAsStringLegal(String fileName, String novaName, String[] regexName,
+                                          Map.Entry<String, Resource> resourceEntry,
+                                          GlobalValidationContext globalContext) {
+    if (!evalPattern(novaName, regexName)) {
+      globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(
+              Messages.NOVA_SERVER_NAME_NOT_ALIGNED_WITH_GUIDE_LINES.getErrorMessage(),
+              resourceEntry.getKey()));
+      return false;
+    }
+    return true;
+  }
+
+  private String getWantedNameFromPropertyValueGetParam(Object value) {
+    Set<String> paramName = HeatStructureUtil
+        .getReferencedValuesByFunctionName(null, ResourceReferenceFunctions.GET_PARAM.getFunction(),
+            value, null);
+    if (paramName != null && CollectionUtils.isNotEmpty(paramName)) {
+      return (String) paramName.toArray()[0];
+    }
+    return null;
+  }
+
+  private String getResourceIdFromPropertyValue(String filename, Object value,
+                                                GlobalValidationContext globalContext) {
+    Set<String> referenceValues = HeatStructureUtil.getReferencedValuesByFunctionName(filename,
+        ResourceReferenceFunctions.GET_RESOURCE.getFunction(), value, globalContext);
+    if (referenceValues != null && CollectionUtils.isNotEmpty(referenceValues)) {
+      return (String) referenceValues.toArray()[0];
+    }
+    return null;
+  }
+
+  private boolean isPropertyValueGetResource(String filename, Object value,
+                                             GlobalValidationContext globalContext) {
+    Set<String> referenceValues = HeatStructureUtil.getReferencedValuesByFunctionName(filename,
+        ResourceReferenceFunctions.GET_RESOURCE.getFunction(), value, globalContext);
+    return referenceValues != null && (referenceValues.size() > 0);
+  }
+
+  private boolean isExpectedToBeExposed(String type) {
+    return HeatResourcesTypes.isResourceExpectedToBeExposed(type);
+  }
+
+  private Set<String> validateManifest(ManifestContent manifestContent,
+                                       GlobalValidationContext globalContext) {
+    Set<String> baseFiles = ManifestUtil.getBaseFiles(manifestContent);
+    if (baseFiles == null || baseFiles.size() == 0) {
+      globalContext.addMessage(
+          AsdcCommon.MANIFEST_NAME,
+          ErrorLevel.WARNING,
+          ErrorMessagesFormatBuilder
+              .getErrorWithParameters(Messages.MISSIN_BASE_HEAT_FILE.getErrorMessage()));
+    } else if (baseFiles.size() > 1) {
+      String baseFileList = getElementListAsString(baseFiles);
+      globalContext.addMessage(
+          AsdcCommon.MANIFEST_NAME,
+          ErrorLevel.WARNING,
+          ErrorMessagesFormatBuilder
+              .getErrorWithParameters(Messages.MULTI_BASE_HEAT_FILE.getErrorMessage(),
+                  baseFileList));
+    }
+    return baseFiles;
+  }
+
+  private String getElementListAsString(Set<String> elementCollection) {
+
+    return "[" + CommonMethods.collectionToCommaSeparatedString(elementCollection)  + "]";
+  }
+
+
+  private Environment validateEnvContent(String envFileName,
+                                         GlobalValidationContext globalContext) {
+    Environment envContent;
+    try {
+      envContent =
+          new YamlUtil().yamlToObject(globalContext.getFileContent(envFileName), Environment.class);
+    } catch (Exception exception) {
+      return null;
+    }
+    return envContent;
+  }
+
+  private HeatOrchestrationTemplate checkHeatOrchestrationPreCondition(String fileName,
+                                                                       GlobalValidationContext
+                                                                           globalContext) {
+    HeatOrchestrationTemplate heatOrchestrationTemplate;
+    try {
+      heatOrchestrationTemplate = new YamlUtil()
+          .yamlToObject(globalContext.getFileContent(fileName), HeatOrchestrationTemplate.class);
+
+    } catch (Exception exception) {
+      return null;
+    }
+    return heatOrchestrationTemplate;
+  }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
new file mode 100644
index 0000000000..c287394a54
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
@@ -0,0 +1,469 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.validation.impl.validators;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.openecomp.core.utilities.json.JsonUtil;
+import org.openecomp.core.utilities.yaml.YamlUtil;
+import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
+import org.openecomp.core.validation.errors.Messages;
+import org.openecomp.core.validation.interfaces.Validator;
+import org.openecomp.core.validation.types.GlobalValidationContext;
+import org.openecomp.sdc.common.utils.AsdcCommon;
+import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.heat.datatypes.DefinedHeatParameterTypes;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData;
+import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
+import org.openecomp.sdc.heat.datatypes.model.Environment;
+import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
+import org.openecomp.sdc.heat.datatypes.model.HeatPseudoParameters;
+import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
+import org.openecomp.sdc.heat.datatypes.model.Output;
+import org.openecomp.sdc.heat.datatypes.model.Parameter;
+import org.openecomp.sdc.heat.datatypes.model.Resource;
+import org.openecomp.sdc.heat.datatypes.model.ResourceReferenceFunctions;
+import org.openecomp.sdc.heat.services.HeatStructureUtil;
+import org.openecomp.sdc.heat.services.manifest.ManifestUtil;
+import org.openecomp.sdc.validation.impl.util.HeatValidationService;
+import org.openecomp.sdc.validation.impl.util.ResourceValidationHeatValidator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+public class HeatValidator implements Validator {
+
+  protected static Logger logger = LoggerFactory.getLogger(HeatValidator.class);
+
+  /* validation 9*/
+  private static void validateAllRequiredArtifactsExist(String fileName,
+                                     HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                     Set<String> artifacts,
+                                     GlobalValidationContext globalContext) {
+    Collection<Resource> resourcesValues = heatOrchestrationTemplate.getResources() == null ? null
+        : heatOrchestrationTemplate.getResources().values();
+
+    if (CollectionUtils.isNotEmpty(resourcesValues)) {
+      for (Resource resource : resourcesValues) {
+        Collection<Object> properties =
+            resource.getProperties() == null ? null : resource.getProperties().values();
+        if (CollectionUtils.isNotEmpty(properties)) {
+          for (Object property : properties) {
+            if (property instanceof Map) {
+              Set<String> artifactNames = HeatStructureUtil
+                  .getReferencedValuesByFunctionName(fileName,
+                      ResourceReferenceFunctions.GET_FILE.getFunction(), property, globalContext);
+              artifacts.addAll(artifactNames);
+              HeatValidationService.checkArtifactsExistence(fileName, artifactNames, globalContext);
+            }
+          }
+        }
+      }
+    }
+
+
+  }
+
+  /* validation 14 */
+  private static void validateAllResourceReferencesExist(String fileName,
+                                     HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                     GlobalValidationContext globalContext) {
+
+    Set<String> resourcesNames = heatOrchestrationTemplate.getResources() == null ? null
+        : heatOrchestrationTemplate.getResources().keySet();
+    Collection<Resource> resourcesValues = heatOrchestrationTemplate.getResources() == null ? null
+        : heatOrchestrationTemplate.getResources().values();
+    Collection<Output> outputsValues = heatOrchestrationTemplate.getOutputs() == null ? null
+        : heatOrchestrationTemplate.getOutputs().values();
+
+    HeatValidationService
+        .checkResourceExistenceFromResourcesMap(fileName, resourcesNames, resourcesValues,
+            globalContext);
+    HeatValidationService
+        .checkResourceExistenceFromResourcesMap(fileName, resourcesNames, outputsValues,
+            globalContext);
+
+  }
+
+  /* validation 16 */
+  private static void validateGetParamPointToParameter(String fileName,
+                                    HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                    GlobalValidationContext globalContext) {
+    Set<String> parametersNames = heatOrchestrationTemplate.getParameters() == null ? null
+        : heatOrchestrationTemplate.getParameters().keySet();
+    Map<String, Resource> resourcesMap = heatOrchestrationTemplate.getResources();
+
+    if (CollectionUtils.isNotEmpty(parametersNames) && MapUtils.isNotEmpty(resourcesMap)) {
+      for (Map.Entry<String, Resource> resourceEntry : resourcesMap.entrySet()) {
+        Resource resource = resourceEntry.getValue();
+        Map<String, Object> properties = resource.getProperties();
+        if (MapUtils.isNotEmpty(properties)) {
+          Collection<Object> propertiesValues = properties.values();
+          if (CollectionUtils.isNotEmpty(propertiesValues)) {
+            for (Object propertyObject : propertiesValues) {
+              //Set<String> referencedParameterNames = HeatValidationService
+              // .getParameterNameFromGetParamMap(propertyObject);
+              Set<String> referencedParameterNames = HeatStructureUtil
+                  .getReferencedValuesByFunctionName(fileName, "get_param", propertyObject,
+                      globalContext);
+
+              validateReferenceParams(fileName, resourceEntry.getKey(), parametersNames,
+                  referencedParameterNames, globalContext);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  private static void validateReferenceParams(String fileName, String resourceName,
+                                              Set<String> parametersNamesFromFile,
+                                              Set<String> referencedParametersNames,
+                                              GlobalValidationContext globalContext) {
+
+    for (String parameterName : referencedParametersNames) {
+      if (!isHeatPseudoParameter(parameterName)
+          && !parametersNamesFromFile.contains(parameterName)) {
+        globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+            .getErrorWithParameters(Messages.REFERENCED_PARAMETER_NOT_FOUND.getErrorMessage(),
+                parameterName, resourceName));
+      }
+    }
+  }
+
+  private static boolean isHeatPseudoParameter(String parameterName) {
+    return HeatPseudoParameters.getPseudoParameterNames().contains(parameterName);
+  }
+
+  /* validation 18*/
+  private static void validateGetAttr(String fileName,
+                                      HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                      GlobalValidationContext globalContext) {
+    Map<String, Output> outputMap;
+    outputMap = heatOrchestrationTemplate.getOutputs();
+
+    if (MapUtils.isNotEmpty(outputMap)) {
+      HeatValidationService.loopOverOutputMapAndValidateGetAttrFromNested(fileName, outputMap,
+          heatOrchestrationTemplate, globalContext);
+    }
+  }
+
+  /* validation 17 + */
+  private static void validateEnvFile(String fileName, String envFileName,
+                                      HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                      GlobalValidationContext globalContext) {
+
+    Environment envContent;
+
+    if (!envFileName.contains(".env")) {
+      globalContext.addMessage(envFileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.WRONG_ENV_FILE_EXTENSION.getErrorMessage(),
+              envFileName));
+    }
+
+    envContent = HeatValidationService.validateEnvContent(fileName, envFileName, globalContext);
+    if (envContent != null) {
+      validateEnvContentIsSubSetOfHeatParameters(envFileName, envContent, globalContext,
+          heatOrchestrationTemplate);
+      validateEnvParametersMatchDefinedHeatParameterTypes(envFileName, envContent, globalContext,
+          heatOrchestrationTemplate);
+    }
+
+  }
+
+  private static void validateEnvContentIsSubSetOfHeatParameters(String envFile,
+                                            Environment envContent,
+                                            GlobalValidationContext globalContext,
+                                            HeatOrchestrationTemplate heatOrchestrationTemplate) {
+    Set<String> parametersNames = heatOrchestrationTemplate.getParameters() == null ? null
+        : heatOrchestrationTemplate.getParameters().keySet();
+
+    if (MapUtils.isNotEmpty(envContent.getParameters())) {
+      if (CollectionUtils.isNotEmpty(parametersNames)) {
+        for (Map.Entry<String, Object> envEntry : envContent.getParameters().entrySet()) {
+          String envParameter = envEntry.getKey();
+          if (!parametersNames.contains(envParameter)) {
+            globalContext.addMessage(envFile, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+                .getErrorWithParameters(
+                    Messages.ENV_INCLUDES_PARAMETER_NOT_IN_HEAT.getErrorMessage(), envFile,
+                    envParameter));
+          }
+        }
+      } else {
+        for (Map.Entry<String, Object> envEntry : envContent.getParameters().entrySet()) {
+          globalContext.addMessage(envFile, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+              .getErrorWithParameters(Messages.ENV_INCLUDES_PARAMETER_NOT_IN_HEAT.getErrorMessage(),
+                  envFile, envEntry.getKey()));
+        }
+      }
+    }
+  }
+
+  private static void validateParameterDefaultTypeAlignWithType(String fileName,
+                                       HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                       GlobalValidationContext globalContext) {
+    Map<String, Parameter> parametersMap = heatOrchestrationTemplate.getParameters() == null ? null
+        : heatOrchestrationTemplate.getParameters();
+
+    if (MapUtils.isNotEmpty(parametersMap)) {
+      for (Map.Entry<String, Parameter> parameterEntry : parametersMap.entrySet()) {
+        Parameter parameter = parameterEntry.getValue();
+        String parameterType = parameter.getType();
+        Object parameterDefault = parameter.get_default();
+        if (parameterDefault != null && parameterType != null) {
+          boolean isValueMatchDefault =
+              DefinedHeatParameterTypes.isValueIsFromGivenType(parameterDefault, parameterType);
+          if (!isValueMatchDefault) {
+            globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+                .getErrorWithParameters(
+                    Messages.PARAMETER_DEFAULT_VALUE_NOT_ALIGN_WITH_TYPE.getErrorMessage(),
+                    parameterEntry.getKey(), parameterType));
+          }
+        }
+      }
+    }
+  }
+
+  private static void validateEnvParametersMatchDefinedHeatParameterTypes(String envFile,
+                                         Environment envContent,
+                                         GlobalValidationContext globalContext,
+                                         HeatOrchestrationTemplate heatOrchestrationTemplate) {
+    Map<String, Parameter> heatParameters = heatOrchestrationTemplate.getParameters();
+
+    if (MapUtils.isNotEmpty(heatParameters) && MapUtils.isNotEmpty(envContent.getParameters())) {
+      for (Map.Entry<String, Object> envEntry : envContent.getParameters().entrySet()) {
+        String parameterName = envEntry.getKey();
+        Object parameterEnvValue = envEntry.getValue();
+        Parameter parameterFromHeatFile = heatParameters.get(parameterName);
+        if (parameterFromHeatFile != null) {
+          String parameterType = parameterFromHeatFile.getType();
+          if (!DefinedHeatParameterTypes.isEmptyValueInEnv(parameterEnvValue)
+              && !DefinedHeatParameterTypes.isValueIsFromGivenType(parameterEnvValue,
+              parameterType)) {
+            globalContext.addMessage(envFile, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+                .getErrorWithParameters(
+                    Messages.PARAMETER_ENV_VALUE_NOT_ALIGN_WITH_TYPE.getErrorMessage(),
+                    parameterName));
+          }
+        }
+      }
+    }
+  }
+
+  @Override
+  public void validate(GlobalValidationContext globalContext) {
+
+    ManifestContent manifestContent;
+    try {
+      manifestContent = checkValidationPreCondition(globalContext);
+    } catch (Exception e0) {
+      return;
+    }
+    String baseFileName;
+    Map<String, FileData.Type> fileTypeMap = ManifestUtil.getFileTypeMap(manifestContent);
+    Map<String, FileData> fileEnvMap = ManifestUtil.getFileAndItsEnv(manifestContent);
+    Set<String> baseFiles = ManifestUtil.getBaseFiles(manifestContent);
+    Set<String> securityGroupsNamesFromBaseFileOutputs;
+    Set<String> artifacts = new HashSet<>();
+
+
+    baseFileName = CollectionUtils.isEmpty(baseFiles) ? null : baseFiles.iterator().next();
+    securityGroupsNamesFromBaseFileOutputs = baseFileName == null ? null
+        : checkForBaseFilePortsExistenceAndReturnSecurityGroupNamesFromOutputsIfNot(baseFileName,
+            globalContext);
+
+
+    globalContext.getFiles().stream()
+        .filter(fileName -> FileData.isHeatFile(fileTypeMap.get(fileName))).forEach(
+          fileName -> validate(fileName,
+            fileEnvMap.get(fileName) == null ? null : fileEnvMap.get(fileName).getFile(),
+            baseFileName == null ? null : baseFileName, artifacts,
+            securityGroupsNamesFromBaseFileOutputs, globalContext));
+
+
+    Set<String> manifestArtifacts = ManifestUtil.getArtifacts(manifestContent);
+
+    globalContext.getFiles().stream()
+        .filter(fileName -> manifestArtifacts.contains(fileName) && !artifacts.contains(fileName))
+        .forEach(fileName -> globalContext.addMessage(fileName, ErrorLevel.WARNING,
+            Messages.ARTIFACT_FILE_NOT_REFERENCED.getErrorMessage()));
+
+    ResourceValidationHeatValidator
+        .handleNotEmptyResourceNamesList(baseFileName, securityGroupsNamesFromBaseFileOutputs,
+            "SecurityGroup", globalContext);
+
+  }
+
+  private void validate(String fileName, String envFileName, String baseFileName,
+                        Set<String> artifacts, Set<String> securityGroupsNamesFromBaseFileOutputs,
+                        GlobalValidationContext globalContext) {
+    HeatOrchestrationTemplate heatOrchestrationTemplate =
+        checkHeatOrchestrationPreCondition(fileName, globalContext);
+
+
+    if (heatOrchestrationTemplate != null) {
+      if (!(fileName.contains(".yaml") || fileName.contains(".yml"))) {
+        globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+            .getErrorWithParameters(Messages.WRONG_HEAT_FILE_EXTENSION.getErrorMessage(),
+                fileName));
+      }
+
+      validateHeatBaseStructure(fileName, heatOrchestrationTemplate, globalContext);
+
+      ResourceValidationHeatValidator
+          .validateResourceType(fileName, baseFileName, securityGroupsNamesFromBaseFileOutputs,
+              heatOrchestrationTemplate, globalContext);
+      validateParameterDefaultTypeAlignWithType(fileName, heatOrchestrationTemplate, globalContext);
+      validateAllResourceReferencesExist(fileName, heatOrchestrationTemplate, globalContext);
+      validateGetParamPointToParameter(fileName, heatOrchestrationTemplate, globalContext);
+      validateGetAttr(fileName, heatOrchestrationTemplate, globalContext);
+      validateAllRequiredArtifactsExist(fileName, heatOrchestrationTemplate, artifacts,
+          globalContext);
+
+      if (envFileName != null) {
+        validateEnvFile(fileName, envFileName, heatOrchestrationTemplate, globalContext);
+      }
+    }
+  }
+
+  private void validateHeatBaseStructure(String fileName,
+                                         HeatOrchestrationTemplate heatOrchestrationTemplate,
+                                         GlobalValidationContext globalContext) {
+    if (heatOrchestrationTemplate.getHeat_template_version() == null) {
+      globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.INVALID_HEAT_FORMAT_REASON.getErrorMessage(),
+              "missing template version"));
+    }
+    if (heatOrchestrationTemplate.getResources() == null
+        || heatOrchestrationTemplate.getResources().size() == 0) {
+      globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.INVALID_HEAT_FORMAT_REASON.getErrorMessage(),
+              "heat file must have minimum one resource"));
+    }
+  }
+
+  protected ManifestContent checkValidationPreCondition(GlobalValidationContext globalContext) {
+    InputStream manifest = globalContext.getFileContent(AsdcCommon.MANIFEST_NAME);
+    if (manifest == null) {
+      throw new RuntimeException("Can't load manifest file for Heat Validator");
+    }
+    ManifestContent manifestContent;
+    try {
+      manifestContent = JsonUtil.json2Object(manifest, ManifestContent.class);
+    } catch (Exception e0) {
+      throw new RuntimeException("Can't load manifest file for Heat Validator");
+    }
+
+    return manifestContent;
+  }
+
+
+  private HeatOrchestrationTemplate checkHeatOrchestrationPreCondition(String fileName,
+                                            GlobalValidationContext globalContext) {
+    HeatOrchestrationTemplate heatOrchestrationTemplate;
+    try {
+      heatOrchestrationTemplate = new YamlUtil()
+          .yamlToObject(globalContext.getFileContent(fileName), HeatOrchestrationTemplate.class);
+    } catch (Exception e0) {
+      globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.INVALID_HEAT_FORMAT_REASON.getErrorMessage(),
+              getParserExceptionReason(e0)));
+      return null;
+    }
+
+    return heatOrchestrationTemplate;
+  }
+
+
+  private Set<String> checkForBaseFilePortsExistenceAndReturnSecurityGroupNamesFromOutputsIfNot(
+      String baseFileName, GlobalValidationContext globalContext) {
+    Set<String> securityGroupsNamesFromOutputsMap = new HashSet<>();
+    HeatOrchestrationTemplate heatOrchestrationTemplate =
+        checkHeatOrchestrationPreCondition(baseFileName, globalContext);
+
+    if (heatOrchestrationTemplate != null) {
+      Map<String, Resource> resourceMap = heatOrchestrationTemplate.getResources();
+      if (!isPortResourceExistInBaseFile(resourceMap)) {
+        getSecurityGroupsReferencedResourcesFromOutputs(securityGroupsNamesFromOutputsMap,
+            heatOrchestrationTemplate.getOutputs(), resourceMap);
+      }
+    }
+
+    return securityGroupsNamesFromOutputsMap;
+  }
+
+
+  @SuppressWarnings("unchecked")
+  private void getSecurityGroupsReferencedResourcesFromOutputs(
+      Set<String> securityGroupsNamesFromOutputsMap, Map<String, Output> outputMap,
+      Map<String, Resource> resourceMap) {
+    if (MapUtils.isNotEmpty(outputMap)) {
+      for (Map.Entry<String, Output> outputEntry : outputMap.entrySet()) {
+        Object outputValue = outputEntry.getValue().getValue();
+        if (Objects.nonNull(outputValue) && outputValue instanceof Map) {
+          String resourceName = (String) ((Map) outputValue)
+              .get(ResourceReferenceFunctions.GET_RESOURCE.getFunction());
+          if (Objects.nonNull(resourceName)) {
+            Resource resource = resourceMap.get(resourceName);
+            if (Objects.nonNull(resource) && resource.getType().equals(
+                HeatResourcesTypes.NEUTRON_SECURITY_GROUP_RESOURCE_TYPE.getHeatResource())) {
+              securityGroupsNamesFromOutputsMap.add(outputEntry.getKey());
+            }
+          }
+        }
+      }
+    }
+  }
+
+
+  private boolean isPortResourceExistInBaseFile(Map<String, Resource> resourceMap) {
+    for (Map.Entry<String, Resource> resourceEntry : resourceMap.entrySet()) {
+      if (resourceEntry.getValue().getType()
+          .equals(HeatResourcesTypes.NEUTRON_PORT_RESOURCE_TYPE.getHeatResource())) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+
+  private String getParserExceptionReason(Exception e0) {
+    String reason;
+
+    if (e0.getCause() != null && e0.getCause().getCause() != null) {
+      reason = e0.getCause().getCause().getMessage();
+    } else if (e0.getCause() != null) {
+      reason = e0.getCause().getMessage();
+    } else {
+      reason = Messages.GENERAL_HEAT_PARSER_ERROR.getErrorMessage();
+    }
+    return reason;
+  }
+
+
+}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/ManifestValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/ManifestValidator.java
new file mode 100644
index 0000000000..4ce40f0007
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/ManifestValidator.java
@@ -0,0 +1,153 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.validation.impl.validators;
+
+import org.openecomp.core.utilities.json.JsonUtil;
+import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
+import org.openecomp.core.validation.errors.Messages;
+import org.openecomp.core.validation.interfaces.Validator;
+import org.openecomp.core.validation.types.GlobalValidationContext;
+import org.openecomp.sdc.common.utils.AsdcCommon;
+import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData;
+import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ManifestValidator implements Validator {
+
+  private static Logger logger = LoggerFactory.getLogger(YamlValidator.class);
+
+
+  @Override
+  public void validate(GlobalValidationContext globalContext) {
+
+
+    InputStream content = globalContext.getFileContent(AsdcCommon.MANIFEST_NAME);
+    ManifestContent manifestContent;
+
+    try {
+      manifestContent = JsonUtil.json2Object(content, ManifestContent.class);
+    } catch (RuntimeException re) {
+      globalContext.addMessage(AsdcCommon.MANIFEST_NAME, ErrorLevel.ERROR,
+          Messages.INVALID_MANIFEST_FILE.getErrorMessage());
+      return;
+    }
+
+    List<String> manifestFiles = getManifestFileList(manifestContent, globalContext);
+    manifestFiles.stream().filter(name ->
+        !globalContext.getFileContextMap().containsKey(name)
+    ).forEach(name -> globalContext
+        .addMessage(name, ErrorLevel.ERROR, Messages.MISSING_FILE_IN_ZIP.getErrorMessage()));
+
+    globalContext.getFileContextMap().keySet().stream().filter(name ->
+        !manifestFiles.contains(name) && !AsdcCommon.MANIFEST_NAME.equals(name)
+    ).forEach(name ->
+        globalContext.addMessage(name, ErrorLevel.WARNING,
+            Messages.MISSING_FILE_IN_MANIFEST.getErrorMessage())
+    );
+
+  }
+
+  private List<String> getManifestFileList(ManifestContent manifestContent,
+                                           GlobalValidationContext context) {
+    ManifestScanner manifestScanner = new ManifestScanner();
+    manifestScanner.init(context);
+    manifestScanner.scan(null, manifestContent.getData(), context);
+    return manifestScanner.getFileList();
+  }
+
+
+  private class ManifestScanner {
+    private GlobalValidationContext globalValidationContext;
+    private List<String> fileList;
+
+    public void init(GlobalValidationContext globalValidationContext) {
+      this.globalValidationContext = globalValidationContext;
+      this.fileList = new ArrayList<>();
+    }
+
+
+    public void scan(FileData fileData, List<FileData> data,
+                     GlobalValidationContext globalContext) {
+      if (fileData == null) {
+        for (FileData childFileData : data) {
+          if (childFileData.getType() != null
+              && childFileData.getType().equals(FileData.Type.HEAT_ENV)) {
+            globalContext.addMessage(childFileData.getFile(), ErrorLevel.ERROR,
+                ErrorMessagesFormatBuilder
+                    .getErrorWithParameters(Messages.ENV_NOT_ASSOCIATED_TO_HEAT.getErrorMessage()));
+          }
+        }
+      }
+      if (fileData != null) {
+        fileList.add(fileData.getFile());
+        validateFileTypeVsFileName(fileData);
+      }
+      if (data == null) {
+        return;
+      }
+      data.stream().forEach(chileFileData -> {
+        scan(chileFileData, chileFileData.getData(), globalContext);
+      });
+    }
+
+
+    public List<String> getFileList() {
+      return this.fileList;
+    }
+
+    private void validateFileTypeVsFileName(FileData fileData) {
+      String fileName = fileData.getFile();
+      if (fileName == null) {
+        this.globalValidationContext.addMessage(AsdcCommon.MANIFEST_NAME, ErrorLevel.ERROR,
+            Messages.MISSING_FILE_NAME_IN_MANIFEST.getErrorMessage());
+
+      }
+      FileData.Type type = fileData.getType();
+      if (type == null) {
+        this.globalValidationContext
+            .addMessage(fileName, ErrorLevel.ERROR, Messages.INVALID_FILE_TYPE.getErrorMessage());
+      } else if (type.equals(FileData.Type.HEAT_NET) || type.equals(FileData.Type.HEAT_VOL)
+          || type.equals(FileData.Type.HEAT)) {
+        if (fileName != null && !fileName.endsWith(".yml") && !fileName.endsWith(".yaml")) {
+          this.globalValidationContext.addMessage(fileName, ErrorLevel.ERROR,
+              ErrorMessagesFormatBuilder
+                  .getErrorWithParameters(Messages.WRONG_HEAT_FILE_EXTENSION.getErrorMessage(),
+                      fileName));
+        }
+      } else if (type.equals(FileData.Type.HEAT_ENV)) {
+        if (fileName != null && !fileName.endsWith(".env")) {
+          this.globalValidationContext.addMessage(fileName, ErrorLevel.ERROR,
+              ErrorMessagesFormatBuilder
+                  .getErrorWithParameters(Messages.WRONG_ENV_FILE_EXTENSION.getErrorMessage(),
+                      fileName));
+        }
+      }
+    }
+  }
+
+
+}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/YamlValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/YamlValidator.java
new file mode 100644
index 0000000000..4d05b2b066
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/YamlValidator.java
@@ -0,0 +1,97 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.validation.impl.validators;
+
+import org.openecomp.core.utilities.yaml.YamlUtil;
+import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
+import org.openecomp.core.validation.errors.Messages;
+import org.openecomp.core.validation.interfaces.Validator;
+import org.openecomp.core.validation.types.GlobalValidationContext;
+import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.error.MarkedYAMLException;
+import org.yaml.snakeyaml.parser.ParserException;
+
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.Map;
+
+public class YamlValidator implements Validator {
+
+  private static final Logger logger = LoggerFactory.getLogger(YamlValidator.class);
+
+  @Override
+  public void validate(GlobalValidationContext globalContext) {
+
+    Collection<String> files = globalContext.files(
+        (fileName, globalValidationContext) -> (fileName.endsWith(".yaml")
+            || fileName.endsWith(".yml") || fileName.endsWith(".env")));
+
+    files.stream().forEach(fileName -> validate(fileName, globalContext));
+  }
+
+  private void validate(String fileName, GlobalValidationContext globalContext) {
+    InputStream rowContent = globalContext.getFileContent(fileName);
+    if (rowContent == null) {
+      globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
+              Messages.EMPTY_YAML_FILE.getErrorMessage()));
+      return; /* no need to continue validation */
+    }
+
+    try {
+      convert(rowContent, Map.class);
+    } catch (Exception exception) {
+
+      globalContext.addMessage(fileName, ErrorLevel.ERROR, ErrorMessagesFormatBuilder
+          .getErrorWithParameters(Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
+              getParserExceptionReason(exception)));
+      logger.error("Exception in yaml parser. message:" + exception.getMessage());
+    }
+  }
+
+  private String getParserExceptionReason(Exception exception) {
+    String reason = null;
+
+    if (exception.getCause() instanceof MarkedYAMLException) {
+      if (exception.getCause() != null) {
+        if (exception.getCause().getCause() instanceof ParserException) {
+          reason = exception.getCause().getCause().getMessage();
+        } else {
+          reason = exception.getCause().getMessage();
+        }
+      }
+    } else if (exception instanceof MarkedYAMLException) {
+
+      reason = exception.getMessage();
+
+    } else {
+      reason = Messages.GENERAL_YAML_PARSER_ERROR.getErrorMessage();
+    }
+    return reason;
+  }
+
+
+  private <T> T convert(InputStream content, Class<T> type) {
+    return new YamlUtil().yamlToObject(content, type);
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/ErrorMessagesTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/ErrorMessagesTest.java
new file mode 100644
index 0000000000..d762689049
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/ErrorMessagesTest.java
@@ -0,0 +1,25 @@
+package org.openecomp.sdc.validation.impl.validators;
+
+import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
+import org.openecomp.core.validation.errors.Messages;
+import org.junit.Test;
+import org.testng.Assert;
+
+public class ErrorMessagesTest {
+
+  @Test
+  public void testErrorFormatWithOneParam() {
+    String error1 = ErrorMessagesFormatBuilder
+        .getErrorWithParameters(Messages.MISSING_FILE_NAME_IN_MANIFEST.getErrorMessage(),
+            "file.yaml");
+    Assert.assertNotNull(error1);
+  }
+
+  @Test
+  public void testErrorFormatWithTwoParams() {
+    String error1 = ErrorMessagesFormatBuilder
+        .getErrorWithParameters(Messages.REFERENCED_PARAMETER_NOT_FOUND.getErrorMessage(), "param",
+            "res");
+    Assert.assertNotNull(error1);
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/ValidatorBaseTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/ValidatorBaseTest.java
new file mode 100644
index 0000000000..f9c5bf423b
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/ValidatorBaseTest.java
@@ -0,0 +1,84 @@
+package org.openecomp.sdc.validation.impl.validators;
+
+import org.openecomp.core.utilities.file.FileUtils;
+import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
+import org.openecomp.core.validation.interfaces.Validator;
+import org.openecomp.core.validation.types.GlobalValidationContext;
+import org.openecomp.core.validation.types.MessageContainer;
+import org.testng.Assert;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+public abstract class ValidatorBaseTest {
+
+  private static GlobalValidationContext createGlobalContextFromPath(String path) {
+    GlobalValidationContext globalValidationContext = new GlobalValidationContext();
+    Map<String, byte[]> contentMap = getContentMapByPath(path);
+    if (contentMap == null) {
+      return null;
+    }
+    contentMap.entrySet().stream()
+        .forEach(entry -> globalValidationContext.addFileContext(entry.getKey(), entry.getValue()));
+
+    return globalValidationContext;
+  }
+
+
+  // New test base implementation
+
+  private static Map<String, byte[]> getContentMapByPath(String path) {
+    Map<String, byte[]> contentMap = new HashMap<>();
+    byte[] fileContent;
+    FileInputStream fis;
+    URL url = ValidatorBaseTest.class.getResource(path);
+    File pathFile = new File(url.getFile());
+    File[] files;
+    if (pathFile.isDirectory()) {
+      files = pathFile.listFiles();
+    } else {
+      files = new File[]{pathFile};
+    }
+
+    if (files == null || files.length == 0) {
+      return null;
+    }
+
+    for (File file : files) {
+      try {
+        fis = new FileInputStream(file);
+        fileContent = FileUtils.toByteArray(fis);
+        contentMap.put(file.getName(), fileContent);
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
+    }
+    return contentMap;
+  }
+
+  public abstract Map<String, MessageContainer> runValidation(String path);
+
+  protected Map<String, MessageContainer> testValidator(Validator validator, String path) {
+
+    GlobalValidationContext globalValidationContext = createGlobalContextFromPath(path);
+    validator.validate(globalValidationContext);
+
+    assert globalValidationContext != null;
+    return globalValidationContext.getContextMessageContainers();
+
+
+  }
+
+  protected void validateErrorMessage(String actualMessage, String expected, String... params) {
+    Assert.assertEquals(actualMessage.replace("\n", "").replace("\r", ""),
+        ErrorMessagesFormatBuilder.getErrorWithParameters(expected, params).replace("\n", "")
+            .replace("\r", ""));
+
+  }
+
+
+}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/EcompGuideLineValidatorTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/EcompGuideLineValidatorTest.java
new file mode 100644
index 0000000000..44e9a3a580
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/EcompGuideLineValidatorTest.java
@@ -0,0 +1,281 @@
+package org.openecomp.sdc.validation.impl.validators.validators;
+
+import org.openecomp.sdc.validation.impl.validators.EcompGuideLineValidator;
+
+import org.openecomp.sdc.validation.impl.validators.ValidatorBaseTest;
+import org.openecomp.core.validation.types.MessageContainer;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+public class EcompGuideLineValidatorTest extends ValidatorBaseTest {
+
+  @Test
+  public void testMissingBaseHeat() {
+    Map<String, MessageContainer> messages =
+        runValidation("/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("MANIFEST.json").getErrorMessageList().size(), 1);
+    Assert.assertEquals(messages.get("MANIFEST.json").getErrorMessageList().get(0).getMessage(),
+        "Missing Base HEAT. Pay attention that without Base HEAT, there will be no shared resources");
+  }
+
+  @Test
+  public void testMultiBaseHeat() {
+    Map<String, MessageContainer> messages =
+        runValidation("/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("MANIFEST.json").getErrorMessageList().size(), 1);
+    Assert.assertEquals(messages.get("MANIFEST.json").getErrorMessageList().get(0).getMessage(),
+        "Multi Base HEAT. Expected only one. Files [second.yaml,first.yaml].");
+  }
+
+  @Test
+  public void testBaseHeatExposeVolume() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "Resource is not defined as output and thus cannot be Shared. resource id - volume_expose");
+  }
+
+  @Test
+  public void testBaseHeatExposeServerGroup() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "Resource is not defined as output and thus cannot be Shared. resource id - ServerGroup_expose");
+  }
+
+  @Test
+  public void testBaseHeatExposeSecurityGroup() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "Resource is not defined as output and thus cannot be Shared. resource id - SecurityGroup_expose");
+  }
+
+
+  @Test
+  public void testBaseHeatExposeNetwork() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "Resource is not defined as output and thus cannot be Shared. resource id - SecurityGroup_expose");
+  }
+
+  @Test
+  public void testBaseHeatExposeNetworkAndVolume() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 2);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "Resource is not defined as output and thus cannot be Shared. resource id - volume_expose");
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(1).getMessage(),
+        "Resource is not defined as output and thus cannot be Shared. resource id - net_expose");
+  }
+
+  @Test
+  public void testNovaResourceNetworkUniqueRole() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "A resource is connected twice to the same network role Resource ID [FSB2] Network Role [Internal1].");
+  }
+
+  @Test
+  public void testHeatVolumeExpose() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("firstVol.yaml").getErrorMessageList().size(), 1);
+    Assert.assertEquals(messages.get("firstVol.yaml").getErrorMessageList().get(0).getMessage(),
+        "Volume is not defined as output and thus cannot be attached volume_expose");
+
+  }
+
+  @Test
+  public void testHeatPortNetworkNamingConvention() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 3);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "Network Parameter Name not aligned with Guidelines Parameter Name [not_valid_network_name] Resource ID [port_resource]");
+  }
+
+  @Test
+  public void testHeatNovaServerMetaDataValidation() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "Missing VNF_ID Resource id [FSB2]");
+  }
+
+  @Test
+  public void testNeutronFixedIpName() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 3);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "Fixed_IPS not aligned with Guidelines, Resource ID [port_resource_0]");
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(1).getMessage(),
+        "Fixed_IPS not aligned with Guidelines, Resource ID [port_resource_1]");
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(2).getMessage(),
+        "Fixed_IPS not aligned with Guidelines, Resource ID [port_resource_2]");
+  }
+
+
+  @Test
+  public void testNovaServerName() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 2);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "Server Name not aligned with Guidelines, Resource ID [FSB2]");
+  }
+
+  @Test
+  public void testAvailabilityZoneName() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 3);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "Server Availability Zone not aligned with Guidelines, Resource ID [FSB2]");
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(1).getMessage(),
+        "Server Availability Zone not aligned with Guidelines, Resource ID [FSB3]");
+  }
+
+  @Test
+  public void testFloatingIpResourceType() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "OS::Neutron::FloatingIP is in use, Resource ID [FSB2]");
+  }
+
+  @Test
+  public void testImageAndFlavorNames() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+
+    messages = runValidation(
+        "/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 2);
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
+        "Wrong flavor name format in NOVA Server, Resource ID [FSB2]");
+    Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(1).getMessage(),
+        "Wrong image name format in NOVA Server, Resource ID [FSB3]");
+  }
+
+
+  @Override
+  public Map<String, MessageContainer> runValidation(String path) {
+    EcompGuideLineValidator validator = new EcompGuideLineValidator();
+    return testValidator(validator, path);
+  }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/EcompNamingConventionTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/EcompNamingConventionTest.java
new file mode 100644
index 0000000000..e4203945aa
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/EcompNamingConventionTest.java
@@ -0,0 +1,104 @@
+package org.openecomp.sdc.validation.impl.validators.validators;
+
+import org.openecomp.sdc.validation.impl.validators.EcompGuideLineValidator;
+import org.openecomp.sdc.validation.impl.validators.ValidatorBaseTest;
+import org.openecomp.core.validation.types.MessageContainer;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class EcompNamingConventionTest extends ValidatorBaseTest {
+
+  @Test
+  public void testNeutronFixedIpName() throws IOException {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input");
+
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 2);
+
+    Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 3);
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(),
+        "Fixed_IPS not aligned with Guidelines, Resource ID [fixed_ip_illegal_name_1]");
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(1).getMessage(),
+        "Fixed_IPS not aligned with Guidelines, Resource ID [fixed_ip_illegal_name_2]");
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(2).getMessage(),
+        "Fixed_IPS not aligned with Guidelines, Resource ID [fixed_ip_illegal_name_3]");
+  }
+
+
+  @Test
+  public void testNovaServerName() throws IOException {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input");
+
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 2);
+
+    Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 6);
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(),
+        "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_1]");
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(1).getMessage(),
+        "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_2]");
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(2).getMessage(),
+        "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_3]");
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(3).getMessage(),
+        "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_4]");
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(4).getMessage(),
+        "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_5]");
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(5).getMessage(),
+        "Missing get_param in nova server name, Resource Id [nova_server_ilegal_name_6]");
+  }
+
+
+  @Test
+  public void testAvailabilityZoneName() throws IOException {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input");
+
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 2);
+
+    Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 2);
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(),
+        "Server Availability Zone not aligned with Guidelines, Resource ID [availability_zone_illegal_name_1]");
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(1).getMessage(),
+        "Server Availability Zone not aligned with Guidelines, Resource ID [availability_zone_illegal_name_2]");
+  }
+
+
+  @Test
+  public void testFloatingIpResourceType() throws IOException {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input");
+
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 2);
+
+    Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 1);
+    Assert.assertEquals(
+        messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(),
+        "OS::Neutron::FloatingIP is in use, Resource ID [floating_ip_type]");
+  }
+
+
+  @Override
+  public Map<String, MessageContainer> runValidation(String path) {
+    EcompGuideLineValidator ecompGuideLineValidator = new EcompGuideLineValidator();
+    return testValidator(ecompGuideLineValidator, path);
+  }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/HeatValidatorTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/HeatValidatorTest.java
new file mode 100644
index 0000000000..9ff375c1a3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/HeatValidatorTest.java
@@ -0,0 +1,356 @@
+package org.openecomp.sdc.validation.impl.validators.validators;
+
+import org.openecomp.sdc.validation.impl.validators.HeatValidator;
+import org.openecomp.sdc.validation.impl.validators.ValidatorBaseTest;
+import org.openecomp.core.validation.types.MessageContainer;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class HeatValidatorTest extends ValidatorBaseTest {
+
+
+    @Test
+    public void testInvalidHeatFormat(){
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Invalid HEAT format problem - [Cannot create property=kuku for JavaBean=Resource{type='null', properties=null, metadata=null, depends_on=null, update_policy='null', deletion_policy='null'}\n" +
+                " in 'reader', line 25, column 5:\n" +
+                "        kuku: kuku\n" +
+                "        ^\n" +
+                "Unable to find property 'kuku' on class: org.openecomp.sdc.heat.datatypes.model.Resource\n" +
+                " in 'reader', line 25, column 11:\n" +
+                "        kuku: kuku\n" +
+                "              ^\n" +
+                "]");
+    }
+
+
+    @Test
+    public void testResourcesReferencesExistInHeat() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 2);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Referenced resource - not_existing_resource not found");
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(1).getMessage(), "invalid get_resource syntax is in use - null , get_resource function should get the resource id of the referenced resource");
+    }
+
+
+    @Test
+    public void testGetResourceValueIsValid(){
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 3);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "invalid get_resource syntax is in use - [param_1, param_2] , get_resource function should get the resource id of the referenced resource");
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(1).getMessage(), "invalid get_resource syntax is in use - {get_param=param_1} , get_resource function should get the resource id of the referenced resource");
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(2).getMessage(), "invalid get_resource syntax is in use - null , get_resource function should get the resource id of the referenced resource");
+    }
+
+    @Test
+    public void testTwoResourcesDoesNotHoldSameId() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input");
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 0);
+    }
+
+    @Test
+    public void negativeTestGetParamPointToExistingParameter() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Referenced parameter - not_existing_param_1 - not found, used in resource - server_pcrf_psm_001");
+    }
+
+    @Test
+    public void testGetAttrFromNested() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "get_attr attribute not found - nested_output in resource server_pcrf_psm_001");
+    }
+
+    @Test
+    public void testPropertiesMatchNestedParameters() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Referenced parameter not found in nested file - nested-pps_v1.0.yaml, resource name - server_pcrf_pps_001, parameter name - parameter_not_existing_in_nested");
+    }
+
+    @Test
+    public void testNovaPropertiesHasAssignedValue() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Missing both Image and Flavor in NOVA Server - nova_server_resource_missing_both");
+    }
+
+    @Test
+    public void testNoLoopsNesting() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 4);
+
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().size(), 2);
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "A resource has an invalid or unsupported type - null, Resource ID [server_pcrf_psm_002]");
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(1).getMessage(), "Nested files loop - [hot-nimbus-psm_v1.0.yaml -- nested-psm_v1.0.yaml -- nested-points-to-hot-nimbus-psm.yaml -- hot-nimbus-psm_v1.0.yaml]");
+
+        Assert.assertEquals(messages.get("nested-points-to-hot-nimbus-psm.yaml").getErrorMessageList().size(), 2);
+        Assert.assertEquals(messages.get("nested-points-to-hot-nimbus-psm.yaml").getErrorMessageList().get(0).getMessage(), "Nested files loop - [nested-points-to-hot-nimbus-psm.yaml -- hot-nimbus-psm_v1.0.yaml -- nested-psm_v1.0.yaml -- nested-points-to-hot-nimbus-psm.yaml]");
+        Assert.assertEquals(messages.get("nested-points-to-hot-nimbus-psm.yaml").getErrorMessageList().get(1).getMessage(), "Nested files loop - [nested-points-to-hot-nimbus-psm.yaml -- nested-psm_v1.0.yaml -- nested-points-to-hot-nimbus-psm.yaml]");
+
+        Assert.assertEquals(messages.get("yaml-point-to-itself.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("yaml-point-to-itself.yaml").getErrorMessageList().get(0).getMessage(), "Nested files loop - [yaml-point-to-itself.yaml -- yaml-point-to-itself.yaml]");
+
+        Assert.assertEquals(messages.get("nested-psm_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("nested-psm_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Nested files loop - [nested-psm_v1.0.yaml -- nested-points-to-hot-nimbus-psm.yaml -- hot-nimbus-psm_v1.0.yaml -- nested-psm_v1.0.yaml]");
+    }
+
+    @Test
+    public void testOnlyOneNovaPointsToOnePort() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Resource Port oam1_int_port exceed allowed relations from NovaServer");
+    }
+
+    @Test
+    public void testServerGroupsPointedByServersDefinedCorrectly() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 3);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Missing server group definition - BE_Affinity_2, nova_server_1");
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(1).getMessage(), "Missing server group definition - BE_Affinity_2, nova_server_2");
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(2).getMessage(), "Referenced resource - BE_Affinity_1 not found");
+    }
+
+
+    @Test
+    public void testPolicyIsAffinityOrAntiAffinity() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Wrong policy in server group - pcrf_server_policies_1");
+    }
+
+
+    @Test
+    public void testEnvContentIsSubSetOfHeatParameters() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.env").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.env").getErrorMessageList().get(0).getMessage(), "Env file hot-nimbus-pps_v1.0.env includes a parameter not in HEAT - mock_param");
+    }
+
+    @Test
+    public void testDefaultValueAlignWithType() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Parameter - pcrf_pps_image_name_1 default value not align with type number");
+    }
+
+
+    @Test
+    public void testEnvParametersMatchDefinedHeatParameterTypes() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.env").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.env").getErrorMessageList().get(0).getMessage(), "Parameter env value pcrf_pps_flavor_name not align with type");
+
+    }
+
+    @Test
+    public void testReferencedArtifactsExist() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Missing artifact - nimbus-ethernet");
+
+    }
+
+
+    @Test
+    public void testResourcesGroupWithNested() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 3);
+
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().size(), 2);
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Referenced parameter not found in nested file - nested-from-resources-group.yaml, resource name - nested-from-resources-group.yaml, parameter name - property_not_in_nested");
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(1).getMessage(), "OS::Heat::ResourceGroup resource with resource_def which is not pointing to nested heat file is not supported, Resource ID [resource_without_resources_group], resource_def type [OS::Nova::Server]");
+
+        Assert.assertEquals(messages.get("nested-pps_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("nested-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "Nested files loop - [nested-pps_v1.0.yaml -- nested-from-resources-group.yaml -- hot-nimbus-pps_v1.0.yaml -- nested-pps_v1.0.yaml]");
+
+        Assert.assertEquals(messages.get("nested-not-exist.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("nested-not-exist.yaml").getErrorMessageList().get(0).getMessage(), "Missing nested file - nested-not-exist.yaml");
+    }
+
+
+    @Test
+    public void testResourceGroupWithInvalidType(){
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().size(), 3);
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "OS::Heat::ResourceGroup resource with resource_def which is not pointing to nested heat file is not supported, Resource ID [resource_with_resources_group_1], resource_def type [{get_param=pcrf_vnf_id}]");
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(1).getMessage(), "OS::Heat::ResourceGroup resource with resource_def which is not pointing to nested heat file is not supported, Resource ID [resource_with_resources_group_2], resource_def type [OS::Nova::Server]");
+        Assert.assertEquals(messages.get("hot-nimbus-psm_v1.0.yaml").getErrorMessageList().get(2).getMessage(), "A resource has an invalid or unsupported type - null, Resource ID [resource_with_resources_group_3]");
+    }
+
+
+    @Test
+    public void testNetworkPolicyAssociatedWithAttachPolicy() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "NetworkPolicy not in use, Resource Id [not_used_server_pcrf_policy]");
+    }
+
+
+    @Test
+    public void testSecurityGroupsCalledByPort() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 2);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "SecurityGroup not in use, Resource Id [not_used_security_group]");
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(1).getMessage(), "Port not bind to any NOVA Server, Resource Id [attach_policy_resource]");
+    }
+
+
+    @Test
+    public void testServerGroupCalledByServer() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "ServerGroup not in use, Resource Id [not_used_server_group]");
+
+    }
+
+
+    @Test
+    public void testSecurityGroupBaseFileNoPorts() throws IOException {
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("baseFile.yaml").getErrorMessageList().size(), 1);
+        Assert.assertEquals(messages.get("baseFile.yaml").getErrorMessageList().get(0).getMessage(), "SecurityGroup not in use, Resource Id [shared_security_group_id3]");
+    }
+
+
+    @Test
+    public void testDependsOn(){
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 2);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "a Missing resource in depend On Missing Resource ID [resource_not_exist]");
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(1).getMessage(), "a Missing resource in depend On Missing Resource ID [resource_3]");
+    }
+
+
+    @Test
+    public void testSharedResourcesValidation(){
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/shared_resources/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().size(), 2);
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(0).getMessage(), "SecurityGroup not in use, Resource Id [not_used_security_group]");
+        Assert.assertEquals(messages.get("hot-nimbus-pps_v1.0.yaml").getErrorMessageList().get(1).getMessage(), "Port not bind to any NOVA Server, Resource Id [attach_policy_resource]");
+    }
+
+
+    @Test
+    public void testNoErrorWhenEmptyValueForParameterInEnv(){
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/env_empty_value/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 1);
+
+        MessageContainer envMessages = messages.get("env_empty_value.env");
+        Assert.assertNull(envMessages);
+    }
+
+
+    @Test
+    public void testGetParamPseudoParameters(){
+        Map<String, MessageContainer> messages = runValidation("/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input");
+
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(messages.size(), 0);
+
+    }
+
+
+    @Override
+    public Map<String, MessageContainer> runValidation(String path) {
+        HeatValidator heatValidator = new HeatValidator();
+        return testValidator(heatValidator, path);
+    }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/ManifestValidatorTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/ManifestValidatorTest.java
new file mode 100644
index 0000000000..479a1fb83b
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/ManifestValidatorTest.java
@@ -0,0 +1,125 @@
+package org.openecomp.sdc.validation.impl.validators.validators;
+
+
+import org.openecomp.sdc.common.utils.AsdcCommon;
+import org.openecomp.sdc.validation.impl.validators.ManifestValidator;
+import org.openecomp.sdc.validation.impl.validators.ValidatorBaseTest;
+import org.openecomp.core.validation.errors.Messages;
+import org.openecomp.core.validation.types.MessageContainer;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+public class ManifestValidatorTest extends ValidatorBaseTest {
+
+
+  @Test
+  public void testValidManifest() {
+    Map<String, MessageContainer> messages =
+        runValidation("/openecomp/org/validation/validators/manifestValidator/validFiles");
+    Assert.assertNotNull(messages);
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+  }
+
+  @Test
+  public void testManifestMissingFileInZip() {
+    Map<String, MessageContainer> messages =
+        runValidation("/openecomp/org/validation/validators/manifestValidator/missingFileInZip");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertTrue(messages.containsKey("singleVol.yaml"));
+    validateErrorMessage(messages.get("singleVol.yaml").getErrorMessageList().get(0).getMessage(),
+        Messages.MISSING_FILE_IN_ZIP.getErrorMessage());
+  }
+
+  @Test
+  public void testInvalidManifest() {
+    Map<String, MessageContainer> messages =
+        runValidation("/openecomp/org/validation/validators/manifestValidator/invalidManifest");
+    Assert.assertNotNull(messages);
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertTrue(messages.containsKey(AsdcCommon.MANIFEST_NAME));
+    validateErrorMessage(
+        messages.get(AsdcCommon.MANIFEST_NAME).getErrorMessageList().get(0).getMessage(),
+        Messages.INVALID_MANIFEST_FILE.getErrorMessage(), AsdcCommon.MANIFEST_NAME);
+
+  }
+
+  @Test
+  public void testMissingFileInManifest() {
+    Map<String, MessageContainer> messages =
+        runValidation("/openecomp/org/validation/validators/manifestValidator/missingFileInManifest");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertTrue(messages.containsKey("extraFile.env"));
+    validateErrorMessage(messages.get("extraFile.env").getErrorMessageList().get(0).getMessage(),
+        Messages.MISSING_FILE_IN_MANIFEST.getErrorMessage());
+
+  }
+
+  @Test
+  public void testInvalidFileTypeInManifest() {
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 4);
+    Assert.assertTrue(messages.containsKey("single.env.illegalSuffix"));
+    Assert.assertTrue(messages.containsKey("illegalTypeFile.yaml"));
+    Assert.assertTrue(messages.containsKey("single.yaml.illegalSuffix"));
+    Assert.assertTrue(messages.containsKey("singleVol.yaml.illegalSuffix"));
+    validateErrorMessage(
+        messages.get("single.env.illegalSuffix").getErrorMessageList().get(0).getMessage(),
+        Messages.WRONG_ENV_FILE_EXTENSION.getErrorMessage(), "single.env.illegalSuffix");
+    validateErrorMessage(
+        messages.get("illegalTypeFile.yaml").getErrorMessageList().get(0).getMessage(),
+        Messages.INVALID_FILE_TYPE.getErrorMessage(), "illegalTypeFile.yaml");
+    validateErrorMessage(
+        messages.get("single.yaml.illegalSuffix").getErrorMessageList().get(0).getMessage(),
+        Messages.WRONG_HEAT_FILE_EXTENSION.getErrorMessage(), "single.yaml.illegalSuffix");
+    validateErrorMessage(
+        messages.get("singleVol.yaml.illegalSuffix").getErrorMessageList().get(0).getMessage(),
+        Messages.WRONG_HEAT_FILE_EXTENSION.getErrorMessage(), "singleVol.yaml.illegalSuffix");
+
+  }
+
+
+  @Test
+  public void testMissingFileInManifestAndInZip() {
+
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 2);
+    Assert.assertTrue(messages.containsKey("extraFile.env"));
+    Assert.assertTrue(messages.containsKey("singleVol.yaml"));
+    validateErrorMessage(messages.get("extraFile.env").getErrorMessageList().get(0).getMessage(),
+        Messages.MISSING_FILE_IN_MANIFEST.getErrorMessage());
+    validateErrorMessage(messages.get("singleVol.yaml").getErrorMessageList().get(0).getMessage(),
+        Messages.MISSING_FILE_IN_ZIP.getErrorMessage());
+
+  }
+
+
+  @Test
+  public void testEnvInRoot() {
+    Map<String, MessageContainer> messages =
+        runValidation("/openecomp/org/validation/validators/manifestValidator/envInRoot");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertTrue(messages.containsKey("second.env"));
+    validateErrorMessage(messages.get("second.env").getErrorMessageList().get(0).getMessage(),
+        "ENV file must be associated to a HEAT file");
+  }
+
+  public Map<String, MessageContainer> runValidation(String path) {
+    ManifestValidator manifestValidator = new ManifestValidator();
+    return testValidator(manifestValidator, path);
+
+  }
+
+
+}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/YamlValidatorTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/YamlValidatorTest.java
new file mode 100644
index 0000000000..abce8ec88c
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/validators/YamlValidatorTest.java
@@ -0,0 +1,89 @@
+package org.openecomp.sdc.validation.impl.validators.validators;
+
+
+import org.openecomp.sdc.validation.impl.validators.ValidatorBaseTest;
+import org.openecomp.sdc.validation.impl.validators.YamlValidator;
+import org.openecomp.core.validation.errors.Messages;
+import org.openecomp.core.validation.types.MessageContainer;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+public class YamlValidatorTest extends ValidatorBaseTest {
+
+
+  public Map<String, MessageContainer> runValidation(String path) {
+    YamlValidator validator = new YamlValidator();
+    return testValidator(validator, path);
+
+  }
+
+  @Test
+  public void testValidYaml() {
+
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/validHeat.yaml");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 0);
+  }
+
+//  @Test
+  public void testInvalidTabYaml() {
+
+    Map<String, MessageContainer> messages = runValidation(
+        "/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalidYamlTab.yaml");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    validateErrorMessage(
+        messages.get("invalidYamlTab.yaml").getErrorMessageList().get(0).getMessage(),
+        Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
+        "while scanning for the next tokenfound character '\\t(TAB)' that cannot start any token. (Do not use \\t(TAB) for indentation) in 'reader', line 14, column 5:        \tadmin_state_up: true        ^");
+
+  }
+
+
+  @Test
+  public void testDuplicateKeyInYaml() {
+
+    Map<String, MessageContainer> messages =
+        runValidation("/openecomp/org/validation/validators/yaml_validator/duplicateKey.yaml");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertTrue(messages.containsKey("duplicateKey.yaml"));
+    validateErrorMessage(
+        messages.get("duplicateKey.yaml").getErrorMessageList().get(0).getMessage(),
+        Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
+        "while parsing MappingNode in 'reader', line 6, column 3:      Key_1_unique:      ^duplicate key: Key_2_not_unique in 'reader', line 31, column 1:        ^");
+  }
+
+
+  @Test
+  public void testInvalidYamlStructure() {
+
+    Map<String, MessageContainer> messages =
+        runValidation("/openecomp/org/validation/validators/yaml_validator/invalidYamlStructure.yaml");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertTrue(messages.containsKey("invalidYamlStructure.yaml"));
+    validateErrorMessage(
+        messages.get("invalidYamlStructure.yaml").getErrorMessageList().get(0).getMessage(),
+        Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
+        "while parsing a block mapping in 'reader', line 8, column 7:          admin_state_up: true          ^expected <block end>, but found BlockEntry in 'reader', line 10, column 7:          - shared: true          ^");
+  }
+
+  @Test
+  public void testEmptyYaml() {
+
+    Map<String, MessageContainer> messages =
+        runValidation("/openecomp/org/validation/validators/yaml_validator/emptyYaml.yaml");
+    Assert.assertNotNull(messages);
+    Assert.assertEquals(messages.size(), 1);
+    Assert.assertTrue(messages.containsKey("emptyYaml.yaml"));
+    validateErrorMessage(messages.get("emptyYaml.yaml").getErrorMessageList().get(0).getMessage(),
+        Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
+        Messages.EMPTY_YAML_FILE.getErrorMessage());
+  }
+
+}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.yaml
new file mode 100644
index 0000000000..368834e847
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  SecurityGroup_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_param: ServerGroup_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/firstVol.yaml
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/firstVol.yaml
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.yaml
new file mode 100644
index 0000000000..08955562d4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  net_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: net_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/firstVol.yaml
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/firstVol.yaml
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.yaml
new file mode 100644
index 0000000000..f5c6b598cc
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.yaml
@@ -0,0 +1,18 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  net_expose:
+    type: OS::Neutron::Net
+  volume_expose:
+    type: OS::Cinder::Volume
+
+
+
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_param: ServerGroup_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/firstVol.yaml
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/firstVol.yaml
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.yaml
new file mode 100644
index 0000000000..0c7abd6d49
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.yaml
@@ -0,0 +1,21 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  net_expose:
+    type: OS::Neutron::Net
+  volume_expose:
+    type: OS::Cinder::Volume
+
+
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: net_expose }
+  expose_resource_volume_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/firstVol.yaml
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/firstVol.yaml
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.yaml
new file mode 100644
index 0000000000..fe5effbc24
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  SecurityGroup_expose:
+    type: OS::Neutron::SecurityGroup
+
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_param: ServerGroup_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/firstVol.yaml
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/firstVol.yaml
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.yaml
new file mode 100644
index 0000000000..781bcba716
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  SecurityGroup_expose:
+    type: OS::Neutron::SecurityGroup
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: SecurityGroup_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/firstVol.yaml
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/firstVol.yaml
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.yaml
new file mode 100644
index 0000000000..5660cc003b
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  ServerGroup_expose:
+    type: OS::Nova::ServerGroup
+
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_param: ServerGroup_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/firstVol.yaml
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/firstVol.yaml
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.yaml
new file mode 100644
index 0000000000..89fafb9d3a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  serverGroup_expose:
+    type: OS::Nova::ServerGroup
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: serverGroup_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/firstVol.yaml
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/firstVol.yaml
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.yaml
new file mode 100644
index 0000000000..e2a4301249
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  volume_expose:
+    type: OS::Cinder::Volume
+
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_param: volume_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/firstVol.yaml
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/firstVol.yaml
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.yaml
new file mode 100644
index 0000000000..63b576edb8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  volume_expose:
+    type: OS::Cinder::Volume
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/firstVol.yaml
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/firstVol.yaml
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.yaml
new file mode 100644
index 0000000000..3d3a1949b1
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.yaml
@@ -0,0 +1,25 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  FSB2:
+    type: OS::Neutron::FloatingIP
+    properties:
+      name: { get_param: fsb_name_2 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2-flavor }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VNF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+outputs:
+  expose_resource_nove_output:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.yaml
new file mode 100644
index 0000000000..2fc2a932fe
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.yaml
@@ -0,0 +1,37 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  FSB2_Internal1:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal1_net_id }
+  FSB2_Internal2:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal2_net_name }
+  FSB2_OAM:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal3_net_id }
+  FSB2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: fsb_name_2 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VNF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+outputs:
+  expose_resource_nove_output:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.yaml
new file mode 100644
index 0000000000..5d6cea4d84
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.yaml
@@ -0,0 +1,37 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  FSB2_Internal1:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal1_net_id }
+  FSB2_Internal2:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal2_net_id }
+  FSB2_OAM:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal1_net_name }
+  FSB2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: fsb_name_2 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VNF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+outputs:
+  expose_resource_nove_output:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.yaml
new file mode 100644
index 0000000000..2c9fd08fb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.yaml
@@ -0,0 +1,52 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  FSB2_Internal1:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal1_net_id }
+  FSB2_Internal2:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal2_net_name }
+  FSB2_OAM:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal3_net_id }
+  FSB2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: fsb_name_2 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VNF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+
+  FSB3:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: fsb_name_2 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VNF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+outputs:
+  expose_resource_nove_output:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.yaml
new file mode 100644
index 0000000000..60f8c45630
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.yaml
@@ -0,0 +1,58 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  FSB2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: pcrf_pps_server_name_4 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_a }
+      metadata:
+        VnF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+
+  FSB3:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: [pcrf_pps_server_names, 0] }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone}
+      metadata:
+        VnF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+
+  FSB4:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: [pcrf_pps_server_names, 0] }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_blabla}
+      metadata:
+        VnF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+outputs:
+  expose_resource_nove_output2:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+  expose_resource_nove_output3:
+      description: the pcrf_server
+      value: { get_resource: FSB3 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.yaml
new file mode 100644
index 0000000000..372761514f
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.yaml
@@ -0,0 +1,43 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+
+  FSB2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: pcrf_pps_server_name_4 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VnF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+  FSB3:
+      type: OS::Nova::Server
+      properties:
+        name: { get_param: [pcrf_pps_server_names, 0] }
+        block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+        flavor: { get_param: fsb2_flavor_name }
+        availability_zone: { get_param: availability_zone_0 }
+        metadata:
+          VnF_id: { get_param: vnfvfVF_id }
+          vf_module_id: { get_param: vf_module_id }
+        networks:
+          - port: { get_resource: FSB2_Internal1 }
+          - port: { get_resource: FSB2_Internal2 }
+          - port: { get_resource: FSB2_OAM }
+outputs:
+  expose_resource_nove_output2:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+  expose_resource_nove_output3:
+      description: the pcrf_server
+      value: { get_resource: FSB3 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.yaml
new file mode 100644
index 0000000000..58e645e168
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.yaml
@@ -0,0 +1,41 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  FSB2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: fsb_name_2 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2-flavor }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VNF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+
+  FSB3:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: fsb_name_2 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      image: { get_param: fsb2-image }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VNF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+
+outputs:
+  expose_resource_nove_output:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.yaml
new file mode 100644
index 0000000000..2fc2a932fe
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.yaml
@@ -0,0 +1,37 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  FSB2_Internal1:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal1_net_id }
+  FSB2_Internal2:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal2_net_name }
+  FSB2_OAM:
+      type: OS::Neutron::Port
+      properties:
+        network_id: { get_param: Internal3_net_id }
+  FSB2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: fsb_name_2 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VNF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+outputs:
+  expose_resource_nove_output:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.yaml
new file mode 100644
index 0000000000..d82e1ee2d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.yaml
@@ -0,0 +1,27 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+
+  FSB2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: fsb_name_2 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        not_VF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+outputs:
+  expose_resource_nove_output_1:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.yaml
new file mode 100644
index 0000000000..85bb15837b
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.yaml
@@ -0,0 +1,26 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+
+  FSB2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: fsb_name_2 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VnF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+outputs:
+  expose_resource_nove_output:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.yaml
new file mode 100644
index 0000000000..3a8e71939f
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.yaml
@@ -0,0 +1,43 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+
+  FSB2:
+    type: OS::Nova::Server
+    properties:
+      name: {get_param: pcrf_pps_server_4}
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VnF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+  FSB3:
+      type: OS::Nova::Server
+      properties:
+        name: { get_param: [pcrf_pps_server, 0] }
+        block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+        flavor: { get_param: fsb2_flavor_name }
+        availability_zone: { get_param: availability_zone_0 }
+        metadata:
+          VnF_id: { get_param: vnfvfVF_id }
+          vf_module_id: { get_param: vf_module_id }
+        networks:
+          - port: { get_resource: FSB2_Internal1 }
+          - port: { get_resource: FSB2_Internal2 }
+          - port: { get_resource: FSB2_OAM }
+outputs:
+  expose_resource_nove_output2:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+  expose_resource_nove_output3:
+      description: the pcrf_server
+      value: { get_resource: FSB3 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.yaml
new file mode 100644
index 0000000000..13fc942865
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.yaml
@@ -0,0 +1,57 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+
+  FSB2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: pcrf_pps_server_name_4 }
+      block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+      flavor: { get_param: fsb2_flavor_name }
+      availability_zone: { get_param: availability_zone_0 }
+      metadata:
+        VnF_id: { get_param: vnfvfVF_id }
+        vf_module_id: { get_param: vf_module_id }
+      networks:
+        - port: { get_resource: FSB2_Internal1 }
+        - port: { get_resource: FSB2_Internal2 }
+        - port: { get_resource: FSB2_OAM }
+  FSB3:
+      type: OS::Nova::Server
+      properties:
+        name: { get_param: [pcrf_pps_server_names, 0] }
+        block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+        flavor: { get_param: fsb2_flavor_name }
+        availability_zone: { get_param: availability_zone_0 }
+        metadata:
+          VnF_id: { get_param: vnfvfVF_id }
+          vf_module_id: { get_param: vf_module_id }
+        networks:
+          - port: { get_resource: FSB2_Internal1 }
+          - port: { get_resource: FSB2_Internal2 }
+          - port: { get_resource: FSB2_OAM }
+  FSB4:
+      type: OS::Nova::Server
+      properties:
+        name: { get_param: [pcrf_pps_server_names, {get_param: index_num}] }
+        block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
+        flavor: { get_param: fsb2_flavor_name }
+        availability_zone: { get_param: availability_zone_0 }
+        metadata:
+          VnF_id: { get_param: vnfvfVF_id }
+          vf_module_id: { get_param: vf_module_id }
+        networks:
+          - port: { get_resource: FSB2_Internal1 }
+          - port: { get_resource: FSB2_Internal2 }
+          - port: { get_resource: FSB2_OAM }
+outputs:
+  expose_resource_nove_output2:
+    description: the pcrf_server
+    value: { get_resource: FSB2 }
+  expose_resource_nove_output3:
+      description: the pcrf_server
+      value: { get_resource: FSB3 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.yaml
new file mode 100644
index 0000000000..85a4c58334
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.yaml
@@ -0,0 +1,40 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  port_resource_0:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: Internal1_net_id }
+     fixed_ips:
+      - ip_address: {get_param: pcrf_net_ips}
+      - ip_address: {get_param: pcrf_net_v6_ip_a}
+  port_resource_1:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: Internal1_net_name }
+     fixed_ips:
+      - ip_address: {get_param: pcrf_net_v6_ips}
+      - ip_address: { "Fn::Select" : [ { get_param: indx }, { get_param: [{ get_param: mvs_mgmt_ip_0 }] } ] }
+  port_resource_2:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: Internal1_net_fqdn }
+     fixed_ips:
+      - ip_address: {get_param: pcrf_net_ipz}
+      - ip_address: {get_param: pcrf_net_v6_ip_4}
+      - ip_address": {get_param: pcrf_net_v0_ip_3}
+
+outputs:
+  expose_resource_port_output_0:
+    description: the pcrf_server
+    value: { get_resource: port_resource_0 }
+  expose_resource_port_output_1:
+    description: the pcrf_server
+    value: { get_resource: port_resource_1 }
+  expose_resource_port_output_2:
+    description: the pcrf_server
+    value: { get_resource: port_resource_2 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.yaml
new file mode 100644
index 0000000000..7e0aaa373d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.yaml
@@ -0,0 +1,39 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  port_resource_0:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: Internal1_net_id }
+     fixed_ips:
+      - ip_address: {get_param: pcrf_net_ips}
+
+  port_resource_1:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: Internal1_net_name }
+     fixed_ips:
+      - ip_address: {get_param: pcrf_net_v6_ips}
+
+  port_resource_2:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: Internal1_net_fqdn }
+     fixed_ips:
+      - ip_address: {get_param: pcrf_net_ip_4}
+      - ip_address: {get_param: pcrf_net_v6_ip_4}
+
+outputs:
+  expose_resource_port_output_0:
+    description: the pcrf_server
+    value: { get_resource: port_resource_0 }
+  expose_resource_port_output_1:
+    description: the pcrf_server
+    value: { get_resource: port_resource_1 }
+  expose_resource_port_output_2:
+    description: the pcrf_server
+    value: { get_resource: port_resource_2 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.yaml
new file mode 100644
index 0000000000..abbf650c8d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.yaml
@@ -0,0 +1,28 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  port_resource:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: not_valid_network_name }
+  port_resource_1:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: not_valid_net }
+  port_resource_2:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: not_valid_net_id_error }
+  port_resource_3:
+      type: OS::Neutron::Port
+      properties:
+       network_id: { get_param:   }
+
+outputs:
+  expose_resource_port_output:
+    description: the pcrf_server
+    value: { get_resource: port_resource }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.yaml
new file mode 100644
index 0000000000..c6128e9470
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.yaml
@@ -0,0 +1,33 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  port_resource_0:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: Internal1_net_id }
+resources:
+  port_resource_1:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: Internal1_net_name }
+resources:
+  port_resource_2:
+    type: OS::Neutron::Port
+    properties:
+     network_id: { get_param: Internal1_net_fqdn }
+
+
+outputs:
+  expose_resource_port_output_0:
+    description: the pcrf_server
+    value: { get_resource: port_resource_0 }
+expose_resource_port_output_1:
+    description: the pcrf_server
+    value: { get_resource: port_resource_1 }
+expose_resource_port_output_2:
+    description: the pcrf_server
+    value: { get_resource: port_resource_2 }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.yaml
new file mode 100644
index 0000000000..3173885d7e
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  volume_expose:
+    type: OS::Cinder::Volume
+
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/firstVol.yaml
new file mode 100644
index 0000000000..4f0d65a735
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_param: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/MANIFEST.json
new file mode 100644
index 0000000000..76ce6de6e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.yaml
new file mode 100644
index 0000000000..63b576edb8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  volume_expose:
+    type: OS::Cinder::Volume
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/firstVol.yaml
new file mode 100644
index 0000000000..7e82b2a7e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/firstVol.yaml
@@ -0,0 +1,19 @@
+
+heat_template_version:  2013-05-23
+
+parameters:
+   not_null:
+     type: number
+     label: not_number
+
+
+resources:
+   volume_expose:
+     type: OS::Cinder::Volume
+     properties:
+       not_null: not_null
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: volume_expose }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/MANIFEST.json
new file mode 100644
index 0000000000..a189124e6c
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": false,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/firstVol.yaml
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/firstVol.yaml
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/second.yaml
new file mode 100644
index 0000000000..bb06b9d60a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/second.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat second
+
+resources:
+  network_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_resource: network_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/MANIFEST.json
new file mode 100644
index 0000000000..3de70a21df
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/MANIFEST.json
@@ -0,0 +1,27 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "firstVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },
+    {
+      "file": "second.yaml",
+      "type": "HEAT",
+      "isBase": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/firstVol.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/firstVol.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/second.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/second.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/expected_output/expected_output.json
new file mode 100644
index 0000000000..e9106a850c
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/expected_output/expected_output.json
@@ -0,0 +1,38 @@
+{
+  "hot-nimbus-pps_v1.0.yaml": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "Server Availability Zone not aligned with Guidelines, Resource ID [availability_zone_illegal_name_1]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Server Availability Zone not aligned with Guidelines, Resource ID [availability_zone_illegal_name_2]"
+      }
+    ]
+  },
+  "nested-pps_v1.0.yaml": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "Missing VF_MODULE_ID resource id [pcrf_server_pps]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Server Name not aligned with Guidelines, Resource ID [pcrf_server_pps]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Fixed_IPS not aligned with Guidelines, Resource ID [pcrf_pps_port_0]"
+      }
+    ]
+  },
+  "MANIFEST.json": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "Missing Base HEAT. Pay attention that without Base HEAT, there will be no shared resources"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/MANIFEST.json
new file mode 100644
index 0000000000..1e719efb31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..809835d2b8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,12 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+  mock_param: abskdjska
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..1b865e75d5
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,92 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    default: True
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  availability_zone_1:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+
+resources:
+
+
+  availability_zone_legal_name_1:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: [pcrf_pps_server_names, 0] }
+      availability_zone: {get_param: availability_zone_1}
+      flavor: { get_param: pcrf_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+  availability_zone_legal_name_2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: [pcrf_pps_server_names, 0] }
+      availability_zone: {get_resource: availability_zone_1}
+      flavor: { get_param: pcrf_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+  availability_zone_illegal_name_1:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: [pcrf_pps_server_names, 0] }
+      availability_zone: {get_param: availability_zone_name}
+      flavor: { get_param: pcrf_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+  availability_zone_illegal_name_2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: [pcrf_pps_server_names, 0] }
+      availability_zone: {get_param: availability_zone}
+      flavor: { get_param: pcrf_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/expected_output/expected_output.json
new file mode 100644
index 0000000000..f0dc0d21a1
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/expected_output/expected_output.json
@@ -0,0 +1,34 @@
+{
+  "hot-nimbus-pps_v1.0.yaml": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "OS::Neutron::FloatingIP is in use, Resource ID [floating_ip_type]"
+      }
+    ]
+  },
+  "nested-pps_v1.0.yaml": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "Missing VF_MODULE_ID resource id [pcrf_server_pps]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Server Name not aligned with Guidelines, Resource ID [pcrf_server_pps]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Fixed_IPS not aligned with Guidelines, Resource ID [pcrf_pps_port_0]"
+      }
+    ]
+  },
+  "MANIFEST.json": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "Missing Base HEAT. Pay attention that without Base HEAT, there will be no shared resources"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/MANIFEST.json
new file mode 100644
index 0000000000..1e719efb31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..809835d2b8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,12 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+  mock_param: abskdjska
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05724cf55b
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,71 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    default: True
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  availability_zone_1:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+
+resources:
+  legal_resource_type1:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: [pcrf_pps_server_names, 0] }
+      availability_zone: {get_param: availability_zone_1}
+      flavor: {get_param: pcrf_flavor_name}
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+  floating_ip_type:
+    type: OS::Neutron::FloatingIP
+    properties:
+      name: { get_param: [pcrf_pps_server_names, 0] }
+      availability_zone: {get_param: availability_zone_name}
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/expected_output/expected_output.json
new file mode 100644
index 0000000000..7eefd3d36e
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/expected_output/expected_output.json
@@ -0,0 +1,42 @@
+{
+  "hot-nimbus-pps_v1.0.yaml": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "Fixed_IPS not aligned with Guidelines, Resource ID [fixed_ip_illegal_name_1]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Fixed_IPS not aligned with Guidelines, Resource ID [fixed_ip_illegal_name_2]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Fixed_IPS not aligned with Guidelines, Resource ID [fixed_ip_illegal_name_3]"
+      }
+    ]
+  },
+  "nested-pps_v1.0.yaml": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "Missing VF_MODULE_ID resource id [pcrf_server_pps]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Server Name not aligned with Guidelines, Resource ID [pcrf_server_pps]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Fixed_IPS not aligned with Guidelines, Resource ID [pcrf_pps_port_0]"
+      }
+    ]
+  },
+  "MANIFEST.json": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "Missing Base HEAT. Pay attention that without Base HEAT, there will be no shared resources"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/MANIFEST.json
new file mode 100644
index 0000000000..1e719efb31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..809835d2b8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,12 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+  mock_param: abskdjska
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..749b7144b6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,128 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    default: True
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_net_ips:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_net_v6_ips:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_net_ip_4:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_net_v6_ip_4:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_net_ipz:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_net_v0_ip_3:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_net_v6_ip_a:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+
+  fixed_ip_legal_name_1:
+    type: OS::Neutron::Port
+    properties:
+      name: {get_param: pcrf_pps_image_name}
+      fixed_ips:
+        - ip_address: {get_param: pcrf_net_ips}
+
+  fixed_ip_legal_name_2:
+    type: OS::Neutron::Port
+    properties:
+      name: {get_param: pcrf_pps_image_name}
+      fixed_ips:
+        - ip_address: {get_param: pcrf_net_v6_ips}
+
+  fixed_ip_legal_name_3:
+    type: OS::Neutron::Port
+    properties:
+      name: {get_param: pcrf_pps_image_name}
+      fixed_ips:
+      - ip_address: {get_param: pcrf_net_ip_4}
+
+  fixed_ip_legal_name_4:
+    type: OS::Neutron::Port
+    properties:
+      name: {get_param: pcrf_pps_image_name}
+      fixed_ips:
+        - ip_address: {get_param: pcrf_net_v6_ip_4}
+
+  fixed_ip_legal_name_5:
+    type: OS::Neutron::Port
+    properties:
+      name: {get_param: pcrf_pps_image_name}
+      fixed_ips:
+        - ip_address: {get_resource: pcrf_net_v6_ip_4}
+
+  fixed_ip_illegal_name_1:
+    type: OS::Neutron::Port
+    properties:
+      name: {get_param: pcrf_pps_image_name}
+      fixed_ips:
+        - ip_address: {get_param: pcrf_net_ipz}
+
+  fixed_ip_illegal_name_2:
+    type: OS::Neutron::Port
+    properties:
+      name: {get_param: pcrf_pps_image_name}
+      fixed_ips:
+        - ip_address": {get_param: pcrf_net_v0_ip_3}
+
+  fixed_ip_illegal_name_3:
+    type: OS::Neutron::Port
+    properties:
+      name: {get_param: pcrf_pps_image_name}
+      fixed_ips:
+        - ip_address: {get_param: pcrf_net_v6_ip_a}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/expected_output/expected_output.json
new file mode 100644
index 0000000000..ca1f58c1f8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/expected_output/expected_output.json
@@ -0,0 +1,50 @@
+{
+  "hot-nimbus-pps_v1.0.yaml": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_1]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_2]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_3]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_4]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_5]"
+      }
+    ]
+  },
+  "nested-pps_v1.0.yaml": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "Missing VF_MODULE_ID resource id [pcrf_server_pps]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Server Name not aligned with Guidelines, Resource ID [pcrf_server_pps]"
+      },
+      {
+        "level": "WARNING",
+        "message": "Fixed_IPS not aligned with Guidelines, Resource ID [pcrf_pps_port_0]"
+      }
+    ]
+  },
+  "MANIFEST.json": {
+    "errorMessageList": [
+      {
+        "level": "WARNING",
+        "message": "Missing Base HEAT. Pay attention that without Base HEAT, there will be no shared resources"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/MANIFEST.json
new file mode 100644
index 0000000000..1e719efb31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..809835d2b8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,12 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+  mock_param: abskdjska
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..766cbf150f
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,138 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    default: True
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_vnf_module_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_flavor:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_pps_server_name_4:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+
+resources:
+  nova_server_legal_name_1:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: [pcrf_pps_server_names, 0] }
+      flavor: { get_param: pcrf_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+
+  nova_server_legal_name_2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: pcrf_pps_server_name_4 }
+      flavor: { get_param: pcrf_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+  nova_server_legal_name_3:
+    type: OS::Nova::Server
+    properties:
+      name: { get_resource: pcrf_pps_server_name_4 }
+      flavor: { get_param: pcrf_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+  nova_server_ilegal_name_1:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: pcrf_pps_server_name_a }
+      flavor: { get_param: pcrf_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+  nova_server_ilegal_name_2:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: pcrf_pps_server_nameds_a }
+      flavor: { get_param: pcrf_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+  nova_server_ilegal_name_3:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: pcrf_pps_server_name_a }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+  nova_server_ilegal_name_4:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: pcrf_pps_server_name_a }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+  nova_server_ilegal_name_5:
+    type: OS::Nova::Server
+    properties:
+      name: { get_param: pcrf_pps_server_name_a }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
+
+  nova_server_ilegal_name_6:
+    type: OS::Nova::Server
+    properties:
+      name: pcrf_pps_server_name_a
+      flavor: { get_param: pcrf_pps_flavor_name }
+      metadata:
+        vnf_id: { get_param: pcrf_vnf_id }
+        vf_module_id: { get_param: pcrf_vnf_module_id }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..1e719efb31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..8ae6fc021a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name_1: 14
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..555f6ae852
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,60 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name_1:
+    type: number
+    default: True
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_image_name_2:
+    type:
+    default: True
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_image_name_3:
+    type: number
+    default:
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: OS::Heat::CloudConfig
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/MANIFEST.json
new file mode 100644
index 0000000000..a1ec6bc0f7
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/MANIFEST.json
@@ -0,0 +1,11 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..35a0efb28d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,43 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+
+resources:
+  resource_depends_on_legal_1:
+    type: OS::Heat::CloudConfig
+    depends_on: [resource_1, resource_2]
+
+  resource_depends_on_legal_2:
+    type: OS::Heat::CloudConfig
+    depends_on: resource_1
+
+  resource_depends_on_illegal_1:
+    type: OS::Heat::CloudConfig
+    depends_on: resource_not_exist
+
+  resource_depends_on_illegal_2:
+    type: OS::Heat::CloudConfig
+    depends_on: [resource_1, resource_3]
+
+  resource_depends_on_illegal_3:
+    type: OS::Heat::CloudConfig
+    depends_on:
+
+  resource_1:
+    type: OS::Heat::CloudConfig
+
+  resource_2:
+    type: OS::Heat::CloudConfig
+
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..1e719efb31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..809835d2b8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,12 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+  mock_param: abskdjska
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..4605195eaf
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,54 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_psm_server_name:
+    type: string
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/MANIFEST.json
new file mode 100644
index 0000000000..d383ab6c95
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "env_empty_value.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "env_empty_value.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.env
new file mode 100644
index 0000000000..20f9eed60d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.env
@@ -0,0 +1,3 @@
+parameters:
+  oam_mgmt_network_id: e1724ea7-553b-470d-a9eb-ed274528a0a1
+  cluster_size: 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.yaml
new file mode 100644
index 0000000000..9d01d63908
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.yaml
@@ -0,0 +1,122 @@
+heat_template_version: 2014-10-16
+
+description: create BIG-IP VE instance
+
+parameters:
+
+  # 06-01-2015 added anti-affinity policy
+  lb_server_group:
+    type: string
+    description: Anti-affinity group for lb
+  server_name:
+    type: comma_delimited_list
+    label: BIG-IP instance name
+    description: BIG-IP instance name
+  image_name:
+    type: string
+    label: image name
+    description: the MVM BIG-IP image name
+  flavor_name:
+    type: string
+    label: bigip flavor name
+    description: the flavor name of bigip instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: the availabilityzone name
+  security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  oam_mgmt_network_id:
+    type: string
+    label: oam network name
+    description: mgmt eth0 local mgmt network
+  oam_mgmt_network_ip:
+    type: comma_delimited_list
+    label: oam network ip
+    description: the local ip of mgmt network
+  oam_network_id:
+    type: string
+    label: bigip oam network id
+    description: oam TMM 1.1 network
+  oam_network_ip:
+    type: comma_delimited_list
+    label: oam network ip
+    description: the local ip of oam network
+  oam_network_vip_ip:
+    type: string
+    label: oam network virtual server ip
+    description: oam network virtual server ip
+  dmz_network_id:
+    type: string
+    label: bigip dmz network id
+    description: dmz TMM 1.2 network
+  dmz_network_ip:
+    type: comma_delimited_list
+    label: dmz network ip
+    description: BIGIP dmz network ip
+  dmz_network_vip_ip:
+    type: string
+    label: dmz network virtual server ip
+    description: dmz network virtual server ip
+  core_network_id:
+    type: string
+    label: core network id
+    description: core TMM 1.3 network
+  core_network_ip:
+    type: comma_delimited_list
+    label: core network ip
+    description: core network ip
+  core_network_vip_ip:
+    type: string
+    label: core network virtual server ip
+    description: core network virtual server ip
+  ha_network_f5_id:
+    type: string
+    label: HA network id
+    description: HA TMM 1.4 network
+  ha_local_ip:
+    type: comma_delimited_list
+    label: HA local ip
+    description: HA failover local ip
+  vnf_id:
+    type: string
+    description: Unique ID for this VF instance
+  vf_module_id:
+    type: string
+    description: Unique ID for this VF_MODULE instance
+  cluster_size:
+    type: number
+    description: number of instance of the VF_module
+
+resources:
+ f5_modules:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: cluster_size }
+      resource_def:
+        type: vvm_f5_5nic.nested.heat.yaml
+        properties:
+          lb_system_name: { get_param: lb_server_group }
+          server_name: { get_param: server_name }
+          image_name:  { get_param: image_name }
+          flavor_name: { get_param: flavor_name }
+          availabilityzone_name: { get_param: availabilityzone_name }
+          security_group_name: { get_param: security_group_name }
+          oam_mgmt_network_id: { get_param: oam_mgmt_network_id }
+          oam_mgmt_network_ip: { get_param: oam_mgmt_network_ip }
+          oam_network_id: { get_param: oam_network_id }
+          oam_network_ip: { get_param: oam_network_ip }
+          oam_network_vip_ip: { get_param: oam_network_vip_ip }
+          dmz_network_id: { get_param: dmz_network_id }
+          dmz_network_ip: { get_param: dmz_network_ip }
+          dmz_network_vip_ip: { get_param: dmz_network_vip_ip }
+          core_network_id: { get_param: core_network_id }
+          core_network_ip: { get_param: core_network_ip }
+          core_network_vip_ip: { get_param: core_network_vip_ip }
+          ha_network_id: { get_param: ha_network_f5_id }
+          ha_local_ip: { get_param: ha_local_ip }
+          vnf_id: { get_param: vnf_id }
+          vf_module_id: { get_param: vf_module_id }
+          indx: "%index%"
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..06df1e696d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/MANIFEST.json
@@ -0,0 +1,35 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..089284d177
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: 1
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..4944424af8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,50 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: number
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: OS::Heat::CloudConfig
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..c27fba2205
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/MANIFEST.json
@@ -0,0 +1,21 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..4a66bf5bf6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,72 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+
+
+outputs:
+  server_pcrf_psm_001_output:
+    description: the pcrf_server
+    value: { get_attr: [ server_pcrf_psm_001, nested_output ] }
+
+
+  server_pcrf_psm_002_output:
+    description: the pcrf_server
+    value: { get_attr:   }
+
+  server_pcrf_psm_003_output:
+    description: the pcrf_server
+    value: { get_attr: []}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..c26a0dd3a8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,103 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
+
+
+outputs:
+  not_in_resource:
+      description: the pcrf_swift_container_1 url
+      value: { get_param: pcrf_psm_server_name }
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..4ab762d34b
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,204 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+outputs:
+  server_pcrf_psm_001_output:
+    description: the pcrf_server
+    value: { get_attr: [ server_pcrf_psm_001, nested_output ] }
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..4b7aac8f44
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,103 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
+
+
+outputs:
+  nested_output:
+      description: the pcrf_swift_container_1 url
+      value: { get_param: pcrf_psm_server_name }
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..c27fba2205
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/MANIFEST.json
@@ -0,0 +1,21 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..6eb260e380
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,55 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+
+
+  server_pcrf_psm_001:
+    type: OS::Contrail::NetworkIpam
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_cps_net_mask: { get_param:   }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+      property_pointing_to_not_existing_param: {get_param: not_existing_param_1}
+
+
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..a1ec6bc0f7
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/MANIFEST.json
@@ -0,0 +1,11 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..9a8e58ffe2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,31 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  param_1:
+    type: number
+
+  param_2:
+    type: number
+
+
+resources:
+  server_pcrf_pps_006:
+      type: OS::Contrail::NetworkIpam
+      properties:
+        pcrf_pps_server_name: { get_resource: [param_1, param_2] }
+
+
+  server_pcrf_pps_007:
+      type: OS::Contrail::NetworkIpam
+      properties:
+        pcrf_pps_server_name: { get_resource: {get_param: param_1} }
+
+
+  server_pcrf_pps_008:
+      type: OS::Contrail::NetworkIpam
+      properties:
+        pcrf_pps_server_name: { get_resource:  }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..5513de2ba2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/MANIFEST.json
@@ -0,0 +1,11 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..a5ee917b2c
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,52 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  num_instances:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+
+  pcrf_pps_image_name:
+    type: string
+  pcrf_pps_flavor_name:
+    type: string
+  availability_zone_0:
+    type: string
+resources:
+  resource_with_resources_group_1:
+    kuku: kuku
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: {get_param: pcrf_vnf_id}
+        properties:
+          pcrf_psm_server_name: { get_param: pcrf_pps_server_names }
+          pcrf_psm_image_name:  { get_param: pcrf_pps_image_name }
+
+
+
+
+  resource_with_resources_group_2:
+    blabla: blabla
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: OS::Nova::Server
+        properties:
+          cloud_zone_id: { get_param: pcrf_pps_server_names }
+          vf_name:  { get_param: pcrf_pps_image_name }
+
+
+
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/MANIFEST.json
new file mode 100644
index 0000000000..1e719efb31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..b2b91ec36d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,69 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  used_server_pcrf_policy:
+    type: OS::Contrail::NetworkPolicy
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  not_used_server_pcrf_policy:
+    type: OS::Contrail::NetworkPolicy
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  server_pcrf_network:
+    type: OS::Contrail::VirtualNetwork
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  attach_policy_resource:
+    type: OS::Contrail::AttachPolicy
+    properties:
+      network: { get_resource: server_pcrf_network }
+      policy: { get_attr: [used_server_pcrf_policy, fq_name] }
+
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..e789fd7b1d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/MANIFEST.json
@@ -0,0 +1,45 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-points-to-hot-nimbus-psm.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "yaml-point-to-itself.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..49e03e0a16
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,56 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+
+  server_pcrf_psm_002:
+    type:
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-points-to-hot-nimbus-psm.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-points-to-hot-nimbus-psm.yaml
new file mode 100644
index 0000000000..981c08c011
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-points-to-hot-nimbus-psm.yaml
@@ -0,0 +1,60 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  network:
+      type: string
+      label: PCRF VNF Id
+      description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: hot-nimbus-psm_v1.0.yaml
+    properties:
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..bfc412d715
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,47 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  psm01_port_0:
+    type: nested-points-to-hot-nimbus-psm.yaml
+    properties:
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/yaml-point-to-itself.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/yaml-point-to-itself.yaml
new file mode 100644
index 0000000000..ec2a02a5d2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/yaml-point-to-itself.yaml
@@ -0,0 +1,21 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+
+resources:
+
+  resource_points_to_itself:
+    type: yaml-point-to-itself.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_name, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..dd26e5ac45
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..8ef73ded21
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,92 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  nova_server_resource_missing_both:
+      type: OS::Nova::Server
+      properties:
+        pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+        availabilityzone_name: { get_param: availabilityzone_name }
+        pcrf_security_group_name: { get_param: pcrf_security_group_name }
+        pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+        pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+        pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+        pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  nova_server_resource_only_image:
+        type: OS::Nova::Server
+        properties:
+          pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+          image: { get_param: pcrf_psm_image_name }
+          availabilityzone_name: { get_param: availabilityzone_name }
+          pcrf_security_group_name: { get_param: pcrf_security_group_name }
+          pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+          pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+          pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+          pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  nova_server_resource_only_flavor:
+        type: OS::Nova::Server
+        properties:
+          pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+          flavor: { get_param: pcrf_psm_flavor_name }
+          availabilityzone_name: { get_param: availabilityzone_name }
+          pcrf_security_group_name: { get_param: pcrf_security_group_name }
+          pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+          pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+          pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+          pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+
+  nova_server_resource_both_without_get_param:
+        type: OS::Nova::Server
+        properties:
+          pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+          flavor: { get_param:   }
+          image: { get_param:   }
+          availabilityzone_name: { get_param: availabilityzone_name }
+          pcrf_security_group_name: { get_param: pcrf_security_group_name }
+          pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+          pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+          pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+          pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..25a4545311
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,236 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  nova_server_resource:
+      type: OS::Nova::Server
+      properties:
+        pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+        image: { get_param: pcrf_psm_image_name }
+        flavor: { get_param: pcrf_psm_flavor_name }
+        availabilityzone_name: { get_param: availabilityzone_name }
+        pcrf_security_group_name: { get_param: pcrf_security_group_name }
+        pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+        pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+        pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+        pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  nova_server_resource_only_image:
+        type: OS::Nova::Server
+        properties:
+          pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+          image: { get_param: pcrf_psm_image_name }
+          availabilityzone_name: { get_param: availabilityzone_name }
+          pcrf_security_group_name: { get_param: pcrf_security_group_name }
+          pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+          pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+          pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+          pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  nova_server_resource_only_flavor:
+        type: OS::Nova::Server
+        properties:
+          pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+          flavor: { get_param: pcrf_psm_flavor_name }
+          availabilityzone_name: { get_param: availabilityzone_name }
+          pcrf_security_group_name: { get_param: pcrf_security_group_name }
+          pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+          pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+          pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+          pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..dd26e5ac45
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..f7678ed6b7
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,95 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  vnf_id:
+    type: string
+
+resources:
+  nova_server_2:
+    type: OS::Nova::Server
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: oam1_int_port }
+          fixed_ip: 10.0.0.0
+          floating_ip: 10.0.0.1
+          network: 100_1000_0011
+          port_extra_properties: {admin_state_up: true , allowed_address_pairs: 10}
+          subnet: 10.0.0.2
+        - port: { get_resource: oam1_mgmt_port }
+      metadata:
+        vnf_id: { get_param: vnf_id }
+
+  nova_server_3:
+      type: OS::Nova::Server
+      properties:
+        pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+        image: { get_param: pcrf_psm_image_name }
+        flavor: { get_param: pcrf_psm_flavor_name }
+        availabilityzone_name: { get_param: availabilityzone_name }
+        networks:
+          - port: { get_resource: oam1_int_port }
+            fixed_ip: 10.0.0.0
+            floating_ip: 10.0.0.1
+            network: 100_1000_0011
+            port_extra_properties: {admin_state_up: true , allowed_address_pairs: 10}
+            subnet: 10.0.0.2
+        metadata:
+          vnf_id: { get_param: vnf_id }
+
+  oam1_int_port:
+    type: OS::Neutron::Port
+    properties:
+      network: {get_param: pcrf_psm_server_names}
+      fixed_ips: [{"ip_address": {get_param: [pcrf_psm_image_name, 0]}}]
+      security_groups: [{get_param: pcrf_psm_image_name}]
+      replacement_policy: AUTO
+
+  oam1_mgmt_port:
+    type: OS::Neutron::Port
+    properties:
+      network: {get_param: pcrf_psm_server_names}
+      fixed_ips: [{"ip_address": {get_param: [pcrf_psm_image_name, 0]}}]
+      security_groups: [{get_param: pcrf_psm_image_name}]
+      replacement_policy: AUTO
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c173fce968
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,233 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  nova_server_1:
+    type: OS::Nova::Server
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: oam1_int_port }
+          fixed_ip: 10.0.0.0
+          floating_ip: 10.0.0.1
+          network: 100_1000_0011
+          port_extra_properties: {admin_state_up: true , allowed_address_pairs: 10}
+          subnet: 10.0.0.2
+        - port: { get_resource: oam1_mgmt_port }
+      metadata:
+        vnf_id: { get_param: vnf_id }
+
+  oam1_int_port:
+    type: OS::Neutron::Port
+    properties:
+      network: {get_param: pcrf_psm_server_names}
+      fixed_ips: [{"ip_address": {get_param: [pcrf_psm_image_name, 0]}}]
+      security_groups: [{get_param: pcrf_psm_image_name}]
+      replacement_policy: AUTO
+
+  oam1_mgmt_port:
+    type: OS::Neutron::Port
+    properties:
+      network: {get_param: pcrf_psm_server_names}
+      fixed_ips: [{"ip_address": {get_param: [pcrf_psm_image_name, 0]}}]
+      security_groups: [{get_param: pcrf_psm_image_name}]
+      replacement_policy: AUTO
+
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..ce04d8c601
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/expected_output/expected_output.json
@@ -0,0 +1,42 @@
+{
+	"name": "multiple_not_nested",
+	"description": "multiple heat files in zip, no nesting",
+	"version": "2013-05-23",
+	"data": [{
+		"file": "cmaui.yml",
+		"type": "HEAT",
+		"data": [{
+			"file": "cmaui.env",
+			"type": "HEAT_ENV"
+		}]
+	},
+	{
+		"file": "eca_oam.yaml",
+		"type": "HEAT",
+		"data": [{
+			"file": "eca_oam.env",
+			"type": "HEAT_ENV"
+		}]
+	},	
+	{
+		"file": "eca_oam_nested.yaml",
+		"type": "HEAT"
+	},	
+	{
+		"file": "MMSC_Capacity_Line.yml",
+		"type": "HEAT",
+		"data": [{
+			"file": "MMSC_Capacity_Line_1.env",
+			"type": "HEAT_ENV"
+		}]
+	},
+	{
+		"file": "SG_ECA_MGMT.yaml",
+		"type": "HEAT",
+		"data": [{
+			"file": "sg_eca_mgmt.env",
+			"type": "HEAT_ENV"
+		}]
+	}
+	]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..fc5b6f74c3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..c86aa34713
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..dd26e5ac45
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f613758633
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,8 @@
+parameters:
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..82edacf101
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,116 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      scheduler_hints: {group_1: { get_resource: pcrf_server_policies_1 }, group_2: { get_resource: pcrf_server_policies_2 }, group_3: { get_resource: pcrf_server_policies_3 }}
+
+  pcrf_server_policies_1:
+    type: OS::Nova::ServerGroup
+    properties:
+      config_drive: "True"
+      policies: [affinity, anti-affinity]
+
+  pcrf_server_policies_2:
+    type: OS::Nova::ServerGroup
+    properties:
+      config_drive: "True"
+      policies:
+
+  pcrf_server_policies_3:
+      type: OS::Nova::ServerGroup
+      properties:
+        config_drive: "True"
+        policies: [affinity,    ]
+
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..a7966d6d47
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,114 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_server_policies:
+    type: OS::Nova::ServerGroup
+    properties:
+      config_drive: "True"
+      policies: [affinity]
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..681117d275
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,112 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
+
+  pcrf_server_policies:
+    type: OS::Nova::ServerGroup
+    properties:
+      config_drive: "True"
+      policies: [anti-affinity]
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..fc5b6f74c3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..c86aa34713
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..fc5b6f74c3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..c86aa34713
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..02118a7b23
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/MANIFEST.json
@@ -0,0 +1,21 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..5d93b2f4f7
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,49 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      parameter_not_existing_in_nested: {get_param: pcrf_vnf_id}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..0ed9043fc2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,74 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/MANIFEST.json
new file mode 100644
index 0000000000..d038fb2a7e
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/MANIFEST.json
@@ -0,0 +1,11 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "pseudo_parameters.yml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/pseudo_parameters.yml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/pseudo_parameters.yml
new file mode 100644
index 0000000000..8dd378ccbd
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/pseudo_parameters.yml
@@ -0,0 +1,61 @@
+heat_template_version:  2013-05-23
+
+description: HOT template for vMME Cinder Volumes
+
+
+parameters:
+
+    volume_type:
+      type: string
+      label:  volume type
+      description: volume type SolidFire
+
+    volume_size:
+      type: number
+      label:  volume size
+      description: my volume size 320GB
+
+    FSB_1_image:
+      type: string
+      label: MME_FSB1
+      description: MME_FSB1_16ACP03_GA
+
+    FSB_2_image:
+      type: string
+      label: MME_FSB2
+      description: MME_FSB2_16ACP03_GA
+
+resources:
+
+    FSB1_volume:
+      type: OS::Cinder::Volume
+      properties:
+        name: 
+          list_join: ['_', [{get_param: 'OS::stack_name'}, 'FSB1_Vol_1']]
+
+    FSB2_volume:
+      type: OS::Cinder::Volume
+      properties:
+        name:
+          list_join: ['_', [{get_param: 'OS::stack_id'}, 'FSB1_Vol_2']]
+
+    FSB3_volume:
+      type: OS::Cinder::Volume
+      properties:
+        name:
+          list_join: ['_', [{get_param: 'OS::project_id'}, 'FSB1_Vol_3']]
+
+
+outputs:
+  FSB1_volume_id:
+    description: ID of Cinder Volume for FSB1
+    value: {get_resource: FSB1_volume}
+
+  FSB2_volume_id:
+    description: ID of Cinder Volume for FSB2
+    value: {get_resource: FSB2_volume}
+
+  FSB3_volume_id:
+    description: ID of Cinder Volume for FSB3
+    value: {get_resource: FSB3_volume}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..a1ec6bc0f7
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/MANIFEST.json
@@ -0,0 +1,11 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..c4680ab619
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file:    }
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..ea7f326c76
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "artifact.sh",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/artifact.sh b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/artifact.sh
new file mode 100644
index 0000000000..fc5b6f74c3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/artifact.sh
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/cloud-nimbus.sh b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/cloud-nimbus.sh
new file mode 100644
index 0000000000..fc5b6f74c3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/cloud-nimbus.sh
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..a591692753
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,212 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  artifact_resource:
+      type: OS::Nova::Server
+      properties:
+        pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+        image: { get_param: pcrf_psm_image_name }
+        flavor: { get_param: pcrf_psm_flavor_name }
+        availabilityzone_name: { get_param: availabilityzone_name }
+        pcrf_security_group_name: { get_param: pcrf_security_group_name }
+        artifact: { get_file: artifact.sh }
+        pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+        pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+        pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..fc5b6f74c3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..c86aa34713
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nimbus-ethernet b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nimbus-ethernet
new file mode 100644
index 0000000000..fc5b6f74c3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nimbus-ethernet
@@ -0,0 +1,99 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..5513de2ba2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/MANIFEST.json
@@ -0,0 +1,11 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..14ee7b10d2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,102 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  num_instances:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_pps_server_names:
+    type: string
+
+  pcrf_pps_image_name:
+    type: string
+  pcrf_pps_flavor_name:
+    type: string
+  availability_zone_0:
+    type: string
+resources:
+  resource_with_resources_group_1:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: {get_param: pcrf_vnf_id}
+        properties:
+          pcrf_psm_server_name: { get_param: pcrf_pps_server_names }
+          pcrf_psm_image_name:  { get_param: pcrf_pps_image_name }
+
+
+
+
+  resource_with_resources_group_2:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: OS::Nova::Server
+        properties:
+          cloud_zone_id: { get_param: pcrf_pps_server_names }
+          vf_name:  { get_param: pcrf_pps_image_name }
+
+
+
+  resource_with_resources_group_3:
+      type: OS::Heat::ResourceGroup
+      properties:
+        count: { get_param: num_instances }
+        resource_def:
+          type:
+          properties:
+            cloud_zone_id: { get_param: pcrf_pps_server_names }
+            vf_name:  { get_param: pcrf_pps_image_name }
+
+
+  resource_with_resources_group_4:
+      type: OS::Heat::ResourceGroup
+      properties:
+        count: { get_param: num_instances }
+        resource_def:
+          type: yamlFile.yaml
+
+
+
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/yamlFile.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/yamlFile.yaml
new file mode 100644
index 0000000000..12a838bcf5
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/yamlFile.yaml
@@ -0,0 +1,47 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  num_instances:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_pps_server_names:
+    type: string
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..3a4d09caa9
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/MANIFEST.json
@@ -0,0 +1,15 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..1154c06f4d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,16 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+resources:
+  server_pcrf_pps_007:
+      type: OS::Contrail::NetworkIpam
+      properties:
+        pcrf_pps_server_name: { get_resource: not_existing_resource }
+
+  server_pcrf_pps_008:
+      type: OS::Contrail::NetworkIpam
+      properties:
+        pcrf_pps_server_name: { get_resource:  }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..05bd6c9318
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,121 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..0c8e740434
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/MANIFEST.json
@@ -0,0 +1,19 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..e3779ed99d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,59 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  num_instances:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+
+
+  resource_with_resources_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: nested-not-exist.yaml
+        properties:
+          pcrf_psm_server_name: { get_param: pcrf_pps_server_names }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..dc78b37ca2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,98 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  num_instances:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_pps_server_names:
+    type: string
+
+  pcrf_pps_image_name:
+    type: string
+  pcrf_pps_flavor_name:
+    type: string
+  availability_zone_0:
+    type: string
+resources:
+  resource_with_resources_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: nested-from-resources-group.yaml
+        properties:
+          pcrf_psm_server_name: { get_param: pcrf_pps_server_names }
+          pcrf_psm_image_name:  { get_param: pcrf_pps_image_name }
+          property_not_in_nested: { get_param: availabilityzone_name }
+          pcrf_cps_net_name: { get_param: availabilityzone_name }
+          pcrf_cps_net_ip: { get_param: pcrf_vnf_id }
+          pcrf_cps_net_mask: { get_param: pcrf_vnf_id }
+          pcrf_security_group_name: { get_param: pcrf_pps_image_name }
+          pcrf_vnf_id: { get_param: pcrf_pps_flavor_name }
+
+          availabilityzone_name: { get_param: availability_zone_0 }
+
+
+
+  resource_without_resources_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: OS::Nova::Server
+        properties:
+          cloud_zone_id: { get_param: pcrf_pps_server_names }
+          vf_name:  { get_param: pcrf_pps_image_name }
+          vf_instance_num: { get_param: pcrf_pps_image_name }
+          vf_component: { get_param: availabilityzone_name }
+          vm_instance_num: { get_param: availabilityzone_name }
+          vnf_id: { get_param: pcrf_vnf_id }
+          vf_module_id: { get_param: pcrf_vnf_id }
+          bootimage: { get_param: pcrf_pps_image_name }
+          flavor: { get_param: pcrf_pps_flavor_name }
+          key_name: { get_param: pcrf_cps_net_mask }
+
+          availability_zone_0: { get_param: availability_zone_0 }
+
+
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-from-resources-group.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-from-resources-group.yaml
new file mode 100644
index 0000000000..836ab5c1f8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-from-resources-group.yaml
@@ -0,0 +1,105 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
+
+  psm01_port_1:
+    type: hot-nimbus-pps_v1.0.yaml
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..bdf957c59e
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,52 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  num_instances:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_pps_server_names:
+    type: string
+resources:
+  resource_with_resources_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: nested-from-resources-group.yaml
+        properties:
+          pcrf_psm_server_name: { get_param: pcrf_pps_server_names }
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..a1ea053e07
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+    pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+    pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+    pcrf_pps_flavor_name: lc.3xlarge
+    availabilityzone_name: nova
+    pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+    pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+    pcrf_cps_net_mask: 255.255.255.0
+    pcrf_security_group_name: nimbus_security_group
+    pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..b12de0def4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,144 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  nova_server:
+    type: OS::Nova::Server
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+      scheduler_hints: { group_1: { get_resource: BE_Affinity_1 }, group_2: { get_resource: BE_Affinity_2 } }
+
+  BE_Affinity_1:
+    type: OS::Nova::ServerGroup
+    properties:
+      network: { get_param: pcrf_pps_server_names }
+
+  BE_Affinity_2:
+    type: OS::Nova::ServerGroup
+    properties:
+      network: { get_param: pcrf_pps_server_names }
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..3f91e94d74
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,288 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  num_instances:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  resource_with_resources_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: nested-from-resources-group.yaml
+        properties:
+          cloud_zone_id: { get_param: cloud_zone_id }
+          vf_name:  { get_param: vf_name }
+          vf_instance_num: { get_param: vf_instance_num }
+          vf_component: { get_param: vf_component }
+          vm_instance_num: { get_param: vm_instance_num }
+          vnf_id: { get_param: vnf_id }
+          vf_module_id: { get_param: vf_module_id }
+          bootimage: { get_param: bootimage }
+          flavor: { get_param: flavor }
+          key_name: { get_param: key_name }
+
+          availability_zone_0: { get_param: availability_zone_0 }
+
+          sec_groups: { get_param: sec_groups }
+          data_volume_size: { get_param: data_volume_size }
+          mgmt_net_id: { get_param: mgmt_net_id }
+
+          sas_mgmt_ip_0: { get_param: sas_mgmt_ip_0 }
+
+          indx: "%index%"
+
+
+  resource_without_resources_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: OS::Nova::Server
+        properties:
+          cloud_zone_id: { get_param: cloud_zone_id }
+          vf_name:  { get_param: vf_name }
+          vf_instance_num: { get_param: vf_instance_num }
+          vf_component: { get_param: vf_component }
+          vm_instance_num: { get_param: vm_instance_num }
+          vnf_id: { get_param: vnf_id }
+          vf_module_id: { get_param: vf_module_id }
+          bootimage: { get_param: bootimage }
+          flavor: { get_param: flavor }
+          key_name: { get_param: key_name }
+
+          availability_zone_0: { get_param: availability_zone_0 }
+
+          sec_groups: { get_param: sec_groups }
+          data_volume_size: { get_param: data_volume_size }
+          mgmt_net_id: { get_param: mgmt_net_id }
+
+          sas_mgmt_ip_0: { get_param: sas_mgmt_ip_0 }
+
+          indx: "%index%"
+
+  resource_with_not_existing_resources_group:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: nested-from-resources-group.yaml
+        properties:
+          cloud_zone_id: { get_param: cloud_zone_id }
+          vf_name:  { get_param: vf_name }
+          vf_instance_num: { get_param: vf_instance_num }
+          vf_component: { get_param: vf_component }
+          vm_instance_num: { get_param: vm_instance_num }
+          vnf_id: { get_param: vnf_id }
+          vf_module_id: { get_param: vf_module_id }
+          bootimage: { get_param: bootimage }
+          flavor: { get_param: flavor }
+          key_name: { get_param: key_name }
+
+          availability_zone_0: { get_param: availability_zone_0 }
+
+          sec_groups: { get_param: sec_groups }
+          data_volume_size: { get_param: data_volume_size }
+          mgmt_net_id: { get_param: mgmt_net_id }
+
+          sas_mgmt_ip_0: { get_param: sas_mgmt_ip_0 }
+
+          indx: "%index%"
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-from-resources-group.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-from-resources-group.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-from-resources-group.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/MANIFEST.json
new file mode 100644
index 0000000000..f487bae31f
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "baseFile.yaml",
+      "type": "HEAT",
+      "isBase": true
+    },
+    {
+      "file": "notBaseFile.yaml",
+      "type": "HEAT",
+      "isBase": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/baseFile.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/baseFile.yaml
new file mode 100644
index 0000000000..9446d6fde0
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/baseFile.yaml
@@ -0,0 +1,43 @@
+heat_template_version: 2013-05-23
+
+description: >
+  Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
+
+parameters:
+  jsa_net_name:
+    type: string
+    description: network name of jsa log network
+  security_group_name:
+      type: string
+      label: security group name
+      description: the name of security group
+
+resources:
+  jsa_security_group1:
+    type: OS::Neutron::SecurityGroup
+    properties:
+      description: ems security group
+      name: {get_param: security_group_name}
+
+
+  jsa_security_group2:
+    type: OS::Neutron::SecurityGroup
+    properties:
+      description: ems security group
+      name: {get_param: security_group_name}
+
+  jsa_security_group3:
+    type: OS::Neutron::SecurityGroup
+    properties:
+      description: ems security group
+      name: {get_param: security_group_name}
+
+outputs:
+    shared_security_group_id1:
+      value: {get_resource: jsa_security_group1}
+
+    shared_security_group_id2:
+          value: {get_resource: jsa_security_group2}
+
+    shared_security_group_id3:
+          value: {get_resource: jsa_security_group3}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/notBaseFile.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/notBaseFile.yaml
new file mode 100644
index 0000000000..7ac05194ac
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/notBaseFile.yaml
@@ -0,0 +1,26 @@
+heat_template_version: 2013-05-23
+
+description: >
+  Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
+
+parameters:
+  shared_security_group_id1:
+      type: string
+      description: network name of jsa log network
+  shared_security_group_id2:
+      type: string
+      description: network name of jsa log network
+  jsa_net_name:
+    type: string
+    description: network name of jsa log network
+  security_group_name:
+      type: string
+      label: security group name
+      description: the name of security group
+
+resources:
+  test_nested:
+    type: OS::Contrail::NetworkIpam
+    properties:
+      p1: { get_param: shared_security_group_id1}
+      p2: { get_param: shared_security_group_id2}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/MANIFEST.json
new file mode 100644
index 0000000000..1e719efb31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..51b9481bfa
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,68 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  used_security_group:
+    type: OS::Neutron::SecurityGroup
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  not_used_security_group:
+    type: OS::Neutron::SecurityGroup
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  server_pcrf_network:
+    type: OS::Contrail::VirtualNetwork
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  attach_policy_resource:
+    type: OS::Neutron::Port
+    properties:
+      security_groups: [{ get_resource: used_security_group }]
+
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/MANIFEST.json
new file mode 100644
index 0000000000..1e719efb31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..63eea76e2e
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,67 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  image_name:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  used_server_group:
+    type: OS::Nova::ServerGroup
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  not_used_server_group:
+    type: OS::Nova::ServerGroup
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  nova_server:
+    type: OS::Nova::Server
+    properties:
+      scheduler_hints: { group: { get_resource: used_server_group } }
+      image: {get_param: image_name}
+
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..1e719efb31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..1955922940
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,70 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  nova_server_1:
+    type: OS::Nova::Server
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      scheduler_hints: { group_1: { get_resource: BE_Affinity_1 }, group_2: { get_resource: BE_Affinity_2 } }
+      networks:
+        - port: {get_resource: BE_Affinity_2}
+
+
+  nova_server_2:
+    type: OS::Nova::Server
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      scheduler_hints: { group_1:  , group_2: { get_resource: BE_Affinity_2 } }
+
+  BE_Affinity_2:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_pps_server_names }
+
+
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..fe7d8bdf5a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/MANIFEST.json
@@ -0,0 +1,51 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "mount_iso_script.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "cloud-nimbus.sh",
+      "type": "SHELL"
+    },
+    {
+      "file": "nimbus-ethernet",
+      "type": "OTHER"
+    },
+    {
+      "file": "nimbus-ethernet-gw",
+      "type": "OTHER"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..a1ea053e07
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+    pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+    pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+    pcrf_pps_flavor_name: lc.3xlarge
+    availabilityzone_name: nova
+    pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+    pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+    pcrf_cps_net_mask: 255.255.255.0
+    pcrf_security_group_name: nimbus_security_group
+    pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..b12de0def4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,144 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  nova_server:
+    type: OS::Nova::Server
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+      scheduler_hints: { group_1: { get_resource: BE_Affinity_1 }, group_2: { get_resource: BE_Affinity_2 } }
+
+  BE_Affinity_1:
+    type: OS::Nova::ServerGroup
+    properties:
+      network: { get_param: pcrf_pps_server_names }
+
+  BE_Affinity_2:
+    type: OS::Nova::ServerGroup
+    properties:
+      network: { get_param: pcrf_pps_server_names }
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..c2d7b05ead
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,199 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..b7291d69d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..6868728b73
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,97 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/MANIFEST.json
new file mode 100644
index 0000000000..1e719efb31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..1114734097
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,90 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  used_security_group:
+    type: OS::Neutron::SecurityGroup
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  not_used_security_group:
+    type: OS::Neutron::SecurityGroup
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  shared_security_group:
+    type: OS::Neutron::SecurityGroup
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  shared_server_group:
+    type: OS::Nova::ServerGroup
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  server_pcrf_network:
+    type: OS::Contrail::VirtualNetwork
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+
+  attach_policy_resource:
+    type: OS::Neutron::Port
+    properties:
+      security_groups: [{ get_resource: used_security_group }]
+
+
+outputs:
+  output_shrared_resource_1:
+    description:  uuid of the security group
+    value: {get_resource: shared_security_group }
+
+  output_shrared_resource_2:
+    description:  uuid of the security group
+    value: {get_resource: shared_server_group }
+
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/MANIFEST.json
new file mode 100644
index 0000000000..06df1e696d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/MANIFEST.json
@@ -0,0 +1,35 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-pps_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-pps_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "nested-pps_v1.0.yaml",
+      "type": "HEAT"
+    },
+    {
+      "file": "nested-psm_v1.0.yaml",
+      "type": "HEAT"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.env
new file mode 100644
index 0000000000..340be2b815
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.env
@@ -0,0 +1,11 @@
+parameters:
+  pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
+  pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_pps_flavor_name: lc.3xlarge
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.yaml
new file mode 100644
index 0000000000..717b915c68
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.yaml
@@ -0,0 +1,125 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_server_names:
+    type: comma_delimited_list
+    label: PCRF PS server names
+    description: PCRF PS server names
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_pps_001:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_002:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_003:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_004:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_005:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_pps_006:
+    type: nested-pps_v1.0.yaml
+    properties:
+      pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
+      pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
+      pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..de8d6b7658
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,207 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+  pcrf_vnf_id:
+    type: number
+    label: PCRF id number
+    description: PCRF id number
+
+resources:
+  server_pcrf_psm_001:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_002:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_003:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_004:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_005:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_006:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_007:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_008:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_009:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_010:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_011:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+
+  server_pcrf_psm_012:
+    type: nested-psm_v1.0.yaml
+    properties:
+      pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
+      pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
+      pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
+      availabilityzone_name: { get_param: availabilityzone_name }
+      pcrf_security_group_name: { get_param: pcrf_security_group_name }
+      pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
+      pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
+      pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
+      pcrf_vnf_id: {get_param: pcrf_vnf_id}
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-pps_v1.0.yaml
new file mode 100644
index 0000000000..153820b2c2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-pps_v1.0.yaml
@@ -0,0 +1,103 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Policy Server stack
+
+parameters:
+  pcrf_pps_server_name:
+    type: string
+    label: PCRF PS server name
+    description: PCRF PS server name
+  pcrf_pps_image_name:
+    type: string
+    label: PCRF PS image name
+    description: PCRF PS image name
+  pcrf_pps_flavor_name:
+    type: string
+    label: PCRF PS flavor name
+    description: flavor name of PCRF PS instance
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_pps_server_name }
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_pps:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_pps_server_name }
+      image: { get_param: pcrf_pps_image_name }
+      flavor: { get_param: pcrf_pps_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: pcrf_pps_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+
+  pcrf_pps_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-psm_v1.0.yaml
new file mode 100644
index 0000000000..f982cc9195
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-psm_v1.0.yaml
@@ -0,0 +1,103 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_server_name:
+    type: string
+    label: PCRF SM server name
+    description: PCRF SM server name
+  pcrf_psm_image_name:
+    type: string
+    label: image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ip:
+    type: string
+    label: CPS network ip
+    description: CPS network ip
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  network:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+          - path: /etc/sysconfig/network-scripts/ifcfg-eth0
+            permissions: "0644"
+            content:
+              str_replace:
+                template: { get_file: nimbus-ethernet }
+                params:
+                  $dev: eth0
+                  $ip: { get_param: pcrf_cps_net_ip }
+                  $netmask: { get_param: pcrf_cps_net_mask }
+        runcmd:
+          - ifdown eth0 && ifup eth0
+  script_init:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          template: { get_file: cloud-nimbus.sh }
+          params:
+            $vm_name: { get_param: pcrf_psm_server_name }
+  pcrf_server_init:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: network}
+      - config: { get_resource: script_init}
+
+  pcrf_server_psm:
+    type: OS::Nova::Server
+    properties:
+      config_drive: "True"
+      name: { get_param: pcrf_psm_server_name }
+      image: { get_param: pcrf_psm_image_name }
+      flavor: { get_param: pcrf_psm_flavor_name }
+      availability_zone: { get_param: availabilityzone_name }
+      networks:
+        - port: { get_resource: psm01_port_0}
+      user_data_format: RAW
+      user_data:
+        get_resource: pcrf_server_init
+      metadata:
+        vnf_id: {get_param: pcrf_vnf_id}
+      #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
+  
+  psm01_port_0:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_param: pcrf_cps_net_name }
+      fixed_ips:
+        - ip_address: { get_param: pcrf_cps_net_ip }
+      security_groups: [{ get_param: pcrf_security_group_name }]
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/expected_output/expected_output.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/expected_output/expected_output.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/MANIFEST.json
new file mode 100644
index 0000000000..dd26e5ac45
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "hot-mog",
+  "description": "HOT template to create hot mog server",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "hot-nimbus-psm_v1.0.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "hot-nimbus-psm_v1.0.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.env
new file mode 100644
index 0000000000..f24e4763c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.env
@@ -0,0 +1,10 @@
+parameters:
+  pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
+  pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
+  pcrf_psm_flavor_name: lc.4xlarge4
+  availabilityzone_name: nova
+  pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
+  pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
+  pcrf_cps_net_mask: 255.255.255.0
+  pcrf_security_group_name: nimbus_security_group
+  pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.yaml
new file mode 100644
index 0000000000..5e940bdd49
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.yaml
@@ -0,0 +1,50 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Session Manager stack
+
+parameters:
+  pcrf_psm_server_names:
+    type: comma_delimited_list
+    label: PCRF SM server names
+    description: name of the PCRF SM instance
+  pcrf_psm_image_name:
+    type: string
+    label: PCRF SM image name
+    description: PCRF SM image name
+  pcrf_psm_flavor_name:
+    type: string
+    label: PCRF SM flavor name
+    description: flavor name of PCRF SM instance 
+  availabilityzone_name:
+    type: string
+    label: availabilityzone name
+    description: availabilityzone name
+  pcrf_cps_net_name:
+    type: string
+    label: CPS network name
+    description: CPS network name
+  pcrf_cps_net_ips:
+    type: comma_delimited_list
+    label: CPS network ips
+    description: CPS network ips
+  pcrf_cps_net_mask:
+    type: string
+    label: CPS network mask
+    description: CPS network mask
+  pcrf_security_group_name:
+    type: string
+    label: security group name
+    description: the name of security group
+  pcrf_vnf_id:
+    type: string
+    label: PCRF VNF Id
+    description: PCRF VNF Id
+
+resources:
+  server_pcrf_psm_001:
+    type: OS::Contrail::NetworkIpam
+
+  server_pcrf_psm_002:
+    type: OS::Contrail::NetworkIpam
+
+ 
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/MANIFEST.json
new file mode 100644
index 0000000000..5524f47fa8
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/MANIFEST.json
@@ -0,0 +1,22 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "first.yaml",
+      "type": "HEAT",
+      "isBase": true,
+      "data": [
+        {
+          "file": "first.env",
+          "type": "HEAT_ENV"
+        }
+      ]
+    },
+    {
+      "file": "second.env",
+      "type": "HEAT_ENV"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.yaml
new file mode 100644
index 0000000000..368834e847
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.yaml
@@ -0,0 +1,14 @@
+heat_template_version: 2013-05-23
+
+description: heat expose volume resource
+
+resources:
+  SecurityGroup_expose:
+    type: OS::Neutron::Net
+
+outputs:
+  not_expose_resource_network_output:
+    description: the pcrf_server
+    value: { get_param: ServerGroup_expose }
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/second.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/second.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/second.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/MANIFEST.json
new file mode 100644
index 0000000000..de35dfc0db
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/MANIFEST.json
@@ -0,0 +1,24 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "single.yaml.illegalSuffix",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "single.env.illegalSuffix",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "singleVol.yaml.illegalSuffix",
+          "type": "HEAT_VOL"
+        }
+      ]
+    },{
+      "file": "illegalTypeFile.yaml",
+      "type": "ILLEGAL_TYPE"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/illegalTypeFile.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/illegalTypeFile.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/illegalTypeFile.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.env.illegalSuffix b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.env.illegalSuffix
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.env.illegalSuffix
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.yaml.illegalSuffix b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.yaml.illegalSuffix
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.yaml.illegalSuffix
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/singleVol.yaml.illegalSuffix b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/singleVol.yaml.illegalSuffix
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/singleVol.yaml.illegalSuffix
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/MANIFEST.json
new file mode 100644
index 0000000000..7b3dd77ed7
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/MANIFEST.json
@@ -0,0 +1,21 @@
+{
+  "name": "inValidTest",
+  "description": "inValid Test",
+  "version": [{"v": "1.0"}],
+  "data": [
+    {
+      "file": "single.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "single.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "singleVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/singleVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/singleVol.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/singleVol.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/MANIFEST.json
new file mode 100644
index 0000000000..fd2b2c3f6d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/MANIFEST.json
@@ -0,0 +1,22 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "invalidField":"value",
+  "data": [
+    {
+      "file": "single.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "single.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "singleVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/extraFile.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/extraFile.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/extraFile.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/singleVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/singleVol.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/singleVol.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/MANIFEST.json
new file mode 100644
index 0000000000..60a8efe769
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/MANIFEST.json
@@ -0,0 +1,21 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "single.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "single.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "singleVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/extraFile.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/extraFile.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/extraFile.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/MANIFEST.json
new file mode 100644
index 0000000000..60a8efe769
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/MANIFEST.json
@@ -0,0 +1,21 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "single.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "single.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "singleVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/MANIFEST.json
new file mode 100644
index 0000000000..60a8efe769
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/MANIFEST.json
@@ -0,0 +1,21 @@
+{
+  "name": "validTest",
+  "description": "Valid Test",
+  "version": "1610",
+  "data": [
+    {
+      "file": "single.yaml",
+      "type": "HEAT",
+      "data": [
+        {
+          "file": "single.env",
+          "type": "HEAT_ENV"
+        },
+        {
+          "file": "singleVol.yaml",
+          "type": "HEAT_VOL"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.env
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.env
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/singleVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/singleVol.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/singleVol.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/duplicateKey.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/duplicateKey.yaml
new file mode 100644
index 0000000000..418cc59c71
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/duplicateKey.yaml
@@ -0,0 +1,30 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  Key_1_unique:
+    properties:
+      admin_state_up: true
+      name: name_notReleventForTest
+      shared: true
+    type: type_notReleventForTest
+  Key_2_not_unique:
+    properties:
+      admin_state_up: true
+      name: name_notReleventForTest
+      shared: true
+    type: type_notReleventForTest
+  Key_2_not_unique:
+    properties:
+      admin_state_up: true
+      name: name_notReleventForTest
+      shared: true
+    type: type_notReleventForTest
+  Key_3_unique:
+    properties:
+      admin_state_up: true
+      name: name_notReleventForTest
+      shared: true
+    type: type_notReleventForTest
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/emptyYaml.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/emptyYaml.yaml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/emptyYaml.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidTabYamlStructure.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidTabYamlStructure.yaml
new file mode 100644
index 0000000000..9cc18cef35
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidTabYamlStructure.yaml
@@ -0,0 +1,24 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  Key_1_unique:
+    properties:
+      admin_state_up: true
+      name: name_notReleventForTest
+      shared: true
+    type: type_notReleventForTest	
+  Key_2_unique:
+    properties:
+      admin_state_up: true
+      name: name_notReleventForTest
+      shared: true
+    type: type_notReleventForTest
+  Key_3_unique:
+    properties:
+      admin_state_up: true
+      name: name_notReleventForTest
+      shared: true
+    type: type_notReleventForTest
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidYamlStructure.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidYamlStructure.yaml
new file mode 100644
index 0000000000..65205e01f9
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidYamlStructure.yaml
@@ -0,0 +1,30 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  Key_1_unique:
+    properties:
+      admin_state_up: true
+      name: name_notReleventForTest
+      - shared: true
+    type: type_notReleventForTest
+  Key_2_not_unique:
+    properties:
+      admin_state_up: true
+      name: name_notReleventForTest
+      shared: true
+    type: type_notReleventForTest
+  Key_2_not_unique:
+    properties:
+      admin_state_up: true
+      name: name_notReleventForTest
+      shared: true
+    type: type_notReleventForTest
+  Key_3_unique:
+    properties:
+      admin_state_up: true
+      name: name_notReleventForTest
+      shared: true
+    type: type_notReleventForTest
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/MANIFEST.json
new file mode 100644
index 0000000000..a4065d0b68
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/MANIFEST.json
@@ -0,0 +1,39 @@
+{
+    "data": [
+        {
+            "file": "validHeat.yaml",
+            "type": "HEAT",
+            "data": [
+                {
+                    "file": "hot-nimbus-oam_v1.0.env",
+                    "type": "HEAT_ENV"
+                },
+                {
+                    "file": "hot-nimbus-oam-volumes_v1.0",
+                    "type": "HEAT_VOL",
+                    "data": [{
+                        "file": "hot-nimbus-oam-volumes_v1.0.env",
+                        "type": "HEAT_ENV"
+                    }]
+                }
+            ]
+        }, 
+        {
+            "file": "mainValid.yaml",
+            "type": "HEAT",
+            "data": [
+                {
+                    "file": "hot-nimbus-oam-networks_v1.0",
+                    "type": "HEAT_NET"
+                }
+            ]
+        },
+        {
+            "file": "missingHeatFromZip.yaml.yaml",
+            "type": "HEAT"
+        }
+    ], 
+    "description": "RXAEmleoRDWLeWVvmXUJxDKCItgjkMEXuKJcUWyVUZrCUiMzZSyHPzhqLcJSIUNBzohsIGXLBIwstuVDEuFtxuLIwWgCCdjprtvzruHIUKdVnCyifJQUJjqSCoKKKyVaWFTFKzHNhTZNlZTYaMKGEpIMXOpIxSyTZZCgVsGkItQelBbFVrmCltTgkuppYMrEfvwqNBLVRSGCucNwliWFZUuXloXBiZaqtodZjyFpqBNqhlpcrARmMpvLiz", 
+    "name": "FCTRQGcMevNngRDvECQYfiEXCYbGeAWRHdaGggLUgyOnssHAiU", 
+    "version": "2013-05-23"
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/heat_missing_from_manifast.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/heat_missing_from_manifast.yaml
new file mode 100644
index 0000000000..d5608abfb4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/heat_missing_from_manifast.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_4:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/mainValid.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/mainValid.yaml
new file mode 100644
index 0000000000..318c8f1283
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/mainValid.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: missingNested.yaml
+  network_4:
+    properties:
+      admin_state_up: true
+      name: { get_file: missing-artifact }
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/validHeat.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/validHeat.yaml
new file mode 100644
index 0000000000..d5608abfb4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/validHeat.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_4:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/expected_output/expected_output.json
new file mode 100644
index 0000000000..dedbeaf5db
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/expected_output/expected_output.json
@@ -0,0 +1,46 @@
+{
+  "invalid_duplicateKey.yaml": {
+    "errorMessageList": [
+      {
+        "level": "ERROR",
+        "message": "Can\u0027t construct a java object for tag:yaml.org,2002:java.util.Map; exception\u003dwhile parsing MappingNode\n in \u0027string\u0027, line 6, column 3:\n      network_0:\n      ^\nduplicate key: network_0\n in \u0027string\u0027, line 26, column 1:\n    \n    ^\n\n in \u0027string\u0027, line 2, column 1:\n    description: Generated template\n    ^\n"
+      }
+    ]
+  },
+  "invalid_empty.yml": {
+    "errorMessageList": [
+      {
+        "level": "ERROR",
+        "message": "File:invalid_empty.yml is empty."
+      }
+    ]
+  },
+  "MANIFEST.json": {
+    "errorMessageList": []
+  },
+  "invalid_yamlInXMLFormat.yaml": {
+    "errorMessageList": [
+      {
+        "level": "ERROR",
+        "message": "Can\u0027t construct a java object for tag:yaml.org,2002:java.util.Map; exception\u003dNo single argument constructor found for interface java.util.Map\n in \u0027string\u0027, line 1, column 1:\n    \u003cstart\u003e\n    ^\n"
+      }
+    ]
+  },
+  "expected_output.json": {
+    "errorMessageList": []
+  },
+  "invalid_additionalSpaceBeforeProperty.yaml": {
+    "errorMessageList": [
+      {
+        "level": "ERROR",
+        "message": "while parsing a block mapping\n in \u0027string\u0027, line 7, column 5:\n        properties:\n        ^\nexpected \u003cblock end\u003e, but found BlockMappingStart\n in \u0027string\u0027, line 9, column 7:\n          name: NET_167\n          ^\n"
+      }
+    ]
+  },
+  "validHeat.yaml": {
+    "errorMessageList": []
+  },
+  "heat_missing_from_manifast.yaml": {
+    "errorMessageList": []
+  }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/MANIFEST.json
new file mode 100644
index 0000000000..a4065d0b68
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/MANIFEST.json
@@ -0,0 +1,39 @@
+{
+    "data": [
+        {
+            "file": "validHeat.yaml",
+            "type": "HEAT",
+            "data": [
+                {
+                    "file": "hot-nimbus-oam_v1.0.env",
+                    "type": "HEAT_ENV"
+                },
+                {
+                    "file": "hot-nimbus-oam-volumes_v1.0",
+                    "type": "HEAT_VOL",
+                    "data": [{
+                        "file": "hot-nimbus-oam-volumes_v1.0.env",
+                        "type": "HEAT_ENV"
+                    }]
+                }
+            ]
+        }, 
+        {
+            "file": "mainValid.yaml",
+            "type": "HEAT",
+            "data": [
+                {
+                    "file": "hot-nimbus-oam-networks_v1.0",
+                    "type": "HEAT_NET"
+                }
+            ]
+        },
+        {
+            "file": "missingHeatFromZip.yaml.yaml",
+            "type": "HEAT"
+        }
+    ], 
+    "description": "RXAEmleoRDWLeWVvmXUJxDKCItgjkMEXuKJcUWyVUZrCUiMzZSyHPzhqLcJSIUNBzohsIGXLBIwstuVDEuFtxuLIwWgCCdjprtvzruHIUKdVnCyifJQUJjqSCoKKKyVaWFTFKzHNhTZNlZTYaMKGEpIMXOpIxSyTZZCgVsGkItQelBbFVrmCltTgkuppYMrEfvwqNBLVRSGCucNwliWFZUuXloXBiZaqtodZjyFpqBNqhlpcrARmMpvLiz", 
+    "name": "FCTRQGcMevNngRDvECQYfiEXCYbGeAWRHdaGggLUgyOnssHAiU", 
+    "version": "2013-05-23"
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/heat_missing_from_manifast.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/heat_missing_from_manifast.yaml
new file mode 100644
index 0000000000..d5608abfb4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/heat_missing_from_manifast.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_4:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalidYamlTab.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalidYamlTab.yaml
new file mode 100644
index 0000000000..042f301507
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalidYamlTab.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+    	admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_4:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_additionalSpaceBeforeProperty.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_additionalSpaceBeforeProperty.yaml
new file mode 100644
index 0000000000..b47d7d32f4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_additionalSpaceBeforeProperty.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+       admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: missingNested.yaml
+  network_4:
+    properties:
+      admin_state_up: true
+      name: { get_file: missing-artifact }
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_duplicateKey.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_duplicateKey.yaml
new file mode 100644
index 0000000000..2dc0c63941
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_duplicateKey.yaml
@@ -0,0 +1,25 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_0:
+      properties:
+        admin_state_up: true
+        name: NET_167
+        shared: true
+      type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_empty.yml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_empty.yml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_empty.yml
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_yamlInXMLFormat.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_yamlInXMLFormat.yaml
new file mode 100644
index 0000000000..54626a9d62
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_yamlInXMLFormat.yaml
@@ -0,0 +1,4 @@
+<start>
+  <additional>dfdf
+  </additional>
+</start>
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/validHeat.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/validHeat.yaml
new file mode 100644
index 0000000000..d5608abfb4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/validHeat.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_4:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/MANIFEST.json
new file mode 100644
index 0000000000..a4065d0b68
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/MANIFEST.json
@@ -0,0 +1,39 @@
+{
+    "data": [
+        {
+            "file": "validHeat.yaml",
+            "type": "HEAT",
+            "data": [
+                {
+                    "file": "hot-nimbus-oam_v1.0.env",
+                    "type": "HEAT_ENV"
+                },
+                {
+                    "file": "hot-nimbus-oam-volumes_v1.0",
+                    "type": "HEAT_VOL",
+                    "data": [{
+                        "file": "hot-nimbus-oam-volumes_v1.0.env",
+                        "type": "HEAT_ENV"
+                    }]
+                }
+            ]
+        }, 
+        {
+            "file": "mainValid.yaml",
+            "type": "HEAT",
+            "data": [
+                {
+                    "file": "hot-nimbus-oam-networks_v1.0",
+                    "type": "HEAT_NET"
+                }
+            ]
+        },
+        {
+            "file": "missingHeatFromZip.yaml.yaml",
+            "type": "HEAT"
+        }
+    ], 
+    "description": "RXAEmleoRDWLeWVvmXUJxDKCItgjkMEXuKJcUWyVUZrCUiMzZSyHPzhqLcJSIUNBzohsIGXLBIwstuVDEuFtxuLIwWgCCdjprtvzruHIUKdVnCyifJQUJjqSCoKKKyVaWFTFKzHNhTZNlZTYaMKGEpIMXOpIxSyTZZCgVsGkItQelBbFVrmCltTgkuppYMrEfvwqNBLVRSGCucNwliWFZUuXloXBiZaqtodZjyFpqBNqhlpcrARmMpvLiz", 
+    "name": "FCTRQGcMevNngRDvECQYfiEXCYbGeAWRHdaGggLUgyOnssHAiU", 
+    "version": "2013-05-23"
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/heat_missing_from_manifast.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/heat_missing_from_manifast.yaml
new file mode 100644
index 0000000000..d5608abfb4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/heat_missing_from_manifast.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_4:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/mainValid.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/mainValid.yaml
new file mode 100644
index 0000000000..318c8f1283
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/mainValid.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: missingNested.yaml
+  network_4:
+    properties:
+      admin_state_up: true
+      name: { get_file: missing-artifact }
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/validHeat.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/validHeat.yaml
new file mode 100644
index 0000000000..d5608abfb4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/validHeat.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_4:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/MANIFEST.json
new file mode 100644
index 0000000000..a4065d0b68
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/MANIFEST.json
@@ -0,0 +1,39 @@
+{
+    "data": [
+        {
+            "file": "validHeat.yaml",
+            "type": "HEAT",
+            "data": [
+                {
+                    "file": "hot-nimbus-oam_v1.0.env",
+                    "type": "HEAT_ENV"
+                },
+                {
+                    "file": "hot-nimbus-oam-volumes_v1.0",
+                    "type": "HEAT_VOL",
+                    "data": [{
+                        "file": "hot-nimbus-oam-volumes_v1.0.env",
+                        "type": "HEAT_ENV"
+                    }]
+                }
+            ]
+        }, 
+        {
+            "file": "mainValid.yaml",
+            "type": "HEAT",
+            "data": [
+                {
+                    "file": "hot-nimbus-oam-networks_v1.0",
+                    "type": "HEAT_NET"
+                }
+            ]
+        },
+        {
+            "file": "missingHeatFromZip.yaml.yaml",
+            "type": "HEAT"
+        }
+    ], 
+    "description": "RXAEmleoRDWLeWVvmXUJxDKCItgjkMEXuKJcUWyVUZrCUiMzZSyHPzhqLcJSIUNBzohsIGXLBIwstuVDEuFtxuLIwWgCCdjprtvzruHIUKdVnCyifJQUJjqSCoKKKyVaWFTFKzHNhTZNlZTYaMKGEpIMXOpIxSyTZZCgVsGkItQelBbFVrmCltTgkuppYMrEfvwqNBLVRSGCucNwliWFZUuXloXBiZaqtodZjyFpqBNqhlpcrARmMpvLiz", 
+    "name": "FCTRQGcMevNngRDvECQYfiEXCYbGeAWRHdaGggLUgyOnssHAiU", 
+    "version": "2013-05-23"
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/heat_missing_from_manifast.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/heat_missing_from_manifast.yaml
new file mode 100644
index 0000000000..d5608abfb4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/heat_missing_from_manifast.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_4:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/mainValid.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/mainValid.yaml
new file mode 100644
index 0000000000..318c8f1283
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/mainValid.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: missingNested.yaml
+  network_4:
+    properties:
+      admin_state_up: true
+      name: { get_file: missing-artifact }
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/validHeat.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/validHeat.yaml
new file mode 100644
index 0000000000..d5608abfb4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/org/openecomp/validation/validators/yaml_validator/input/validHeat.yaml
@@ -0,0 +1,250 @@
+### Heat Template ###
+description: Generated template
+heat_template_version: 2013-05-23
+parameters: {}
+resources:
+  network_0:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  network_1:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_2:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_3:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_4:
+    properties:
+      admin_state_up: true
+      name: NET_169
+      shared: true
+    type: OS::Neutron::Net
+  network_5:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_6:
+    properties:
+      admin_state_up: true
+      name: NET_168
+      shared: true
+    type: OS::Neutron::Net
+  network_7:
+    properties:
+      admin_state_up: true
+      name: NET_170
+      shared: true
+    type: OS::Neutron::Net
+  network_8:
+    properties:
+      admin_state_up: true
+      name: NET_166
+      shared: true
+    type: OS::Neutron::Net
+  network_9:
+    properties:
+      admin_state_up: true
+      name: NET_167
+      shared: true
+    type: OS::Neutron::Net
+  security_group_0:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  security_group_1:
+    properties:
+      description: Default security group
+      name: _default
+      rules:
+      - direction: egress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+      - direction: ingress
+        ethertype: IPv4
+        remote_ip_prefix: 0.0.0.0/0
+    type: OS::Neutron::SecurityGroup
+  subnet_0:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_9
+    type: OS::Neutron::Subnet
+  subnet_1:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.254
+        start: 10.147.32.130
+      cidr: 10.147.32.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_167
+      network_id:
+        get_resource: network_0
+    type: OS::Neutron::Subnet
+  subnet_2:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_8
+    type: OS::Neutron::Subnet
+  subnet_3:
+    properties:
+      allocation_pools:
+      - end: 10.147.32.126
+        start: 10.147.32.2
+      cidr: 10.147.32.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_166
+      network_id:
+        get_resource: network_2
+    type: OS::Neutron::Subnet
+  subnet_4:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_5
+    type: OS::Neutron::Subnet
+  subnet_5:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_6
+    type: OS::Neutron::Subnet
+  subnet_6:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.126
+        start: 10.147.33.2
+      cidr: 10.147.33.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_168
+      network_id:
+        get_resource: network_3
+    type: OS::Neutron::Subnet
+  subnet_7:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_1
+    type: OS::Neutron::Subnet
+  subnet_8:
+    properties:
+      allocation_pools:
+      - end: 10.147.33.254
+        start: 10.147.33.130
+      cidr: 10.147.33.128/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_169
+      network_id:
+        get_resource: network_4
+    type: OS::Neutron::Subnet
+  subnet_9:
+    properties:
+      allocation_pools:
+      - end: 10.147.34.126
+        start: 10.147.34.2
+      cidr: 10.147.34.0/25
+      dns_nameservers:
+      - 10.147.4.18
+      - 10.247.5.11
+      enable_dhcp: true
+      host_routes: []
+      ip_version: 4
+      name: NET_170
+      network_id:
+        get_resource: network_7
+    type: OS::Neutron::Subnet
+