[SDC] rebase code

Change-Id: I456ec65a233d277e6bae35e140f2e3da5765bae6
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 3 insertions, 15 deletions

diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUtils.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUtils.java
index 95fbefa040..621cc26a12 100644
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUtils.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUtils.java
@@ -767,24 +767,16 @@ public class OnboardingUtils {
 		LinkedList<HeatMetaFirstLevelDefinition> deploymentArtifacts = ((LinkedList<HeatMetaFirstLevelDefinition>) combinedMap.get("Deployment"));
 		ArtifactsCorrelationManager.addVNFartifactDetails(vspName, deploymentArtifacts);
 		
-		List<String> heatEnvFilesFromCSAR = deploymentArtifacts.stream().filter(e -> e.getType().equals("HEAT_ENV")).
-																		 map(e -> e.getFileName()).
-																		 collect(Collectors.toList());
-		
-		validateDeploymentArtifactsVersion(deploymentArtifacts, heatEnvFilesFromCSAR);
-		
+		validateDeploymentArtifactsVersion(deploymentArtifacts);
 		DeploymentArtifactPage.verifyArtifactsExistInTable(filepath, vnfFile);
 		return createVendorSoftwareProduct;
 	}
 
-	public static void validateDeploymentArtifactsVersion(LinkedList<HeatMetaFirstLevelDefinition> deploymentArtifacts,
-			List<String> heatEnvFilesFromCSAR) {
-		String artifactVersion;
+	public static void validateDeploymentArtifactsVersion(LinkedList<HeatMetaFirstLevelDefinition> deploymentArtifacts) {
+		String artifactVersion = "1";
 		String artifactName;
 		
 		for(HeatMetaFirstLevelDefinition deploymentArtifact: deploymentArtifacts) {
-			artifactVersion = "1";
-			
 			if(deploymentArtifact.getType().equals("HEAT_ENV")) {
 				continue;
 			} else if(deploymentArtifact.getFileName().contains(".")) {
@@ -792,10 +784,6 @@ public class OnboardingUtils {
 			} else {
 				artifactName = deploymentArtifact.getFileName().trim();				
 			}
-			
-			if (heatEnvFilesFromCSAR.contains(artifactName + ".env")){
-				artifactVersion = "2";
-			}
 			ArtifactUIUtils.validateArtifactNameVersionType(artifactName, artifactVersion, deploymentArtifact.getType());			
 		}
 	}