1 files changed, 179 insertions, 41 deletions
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentEntry.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentEntry.java
index 04dbf523d0..92220f8717 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentEntry.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentEntry.java
@@ -21,81 +21,219 @@
 
 package org.openecomp.mso.openstack.utils;
 
+
+
+import java.util.HashSet;
+import java.util.ArrayList;
 import java.util.Set;
+import org.openecomp.mso.db.catalog.beans.HeatTemplateParam;
 import org.openecomp.mso.logger.MsoLogger;
 
 public class MsoHeatEnvironmentEntry {
 
-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
-	private Set<MsoHeatEnvironmentParameter> parameters;
-	private String rawEntry;
+    private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+    
+	private Set<MsoHeatEnvironmentParameter> parameters = null;
+	private Set<MsoHeatEnvironmentResource> resources = null;
+	private StringBuilder rawEntry = null;
 	private boolean valid = true;
-	private String errorString;
-	private String resourceRegistryEntryRaw;
-
-	private MsoHeatEnvironmentEntry(String rawEntry) {
-		this.rawEntry = rawEntry;
+	private String errorString = null;
+	private StringBuilder resourceRegistryEntryRaw = null;
+	
+	public MsoHeatEnvironmentEntry() {
+		super();
 	}
-
-	private MsoHeatEnvironmentEntry(Set<MsoHeatEnvironmentParameter> parameters, String rawEntry, boolean valid,
-			String errorString, String resourceRegistryEntryRaw) {
-		this.parameters = parameters;
-		this.rawEntry = rawEntry;
-		this.valid = valid;
-		this.errorString = errorString;
-		this.resourceRegistryEntryRaw = resourceRegistryEntryRaw;
+	
+	public MsoHeatEnvironmentEntry(StringBuilder sb) {
+		this();
+		this.rawEntry = sb;
+		this.processRawEntry();
 	}
-
+	
+	private void processRawEntry() {
+		try {
+			if (this.rawEntry == null || "".equals(this.rawEntry))
+				return;
+			byte[] b = this.rawEntry.toString().getBytes();
+			MsoYamlEditorWithEnvt yaml = new MsoYamlEditorWithEnvt(b);
+			this.parameters = yaml.getParameterListFromEnvt();
+			//this.resources = yaml.getResourceListFromEnvt();
+			StringBuilder sb = this.getResourceRegistryRawEntry();
+			if (sb == null) {
+				this.resourceRegistryEntryRaw = new StringBuilder("");
+			} else {
+				this.resourceRegistryEntryRaw = sb;
+			}
+		} catch (Exception e) {
+		    LOGGER.debug("Exception:", e);
+			this.valid = false;
+			this.errorString = e.getMessage();
+			//e.printStackTrace();
+		}
+	}
+	
 	public boolean isValid() {
 		return this.valid;
 	}
 	public String getErrorString() {
 		return this.errorString;
 	}
-
+	
+	public Set<MsoHeatEnvironmentParameter> getParameters() {
+		return this.parameters;
+	}
+	public Set<MsoHeatEnvironmentResource> getResources() {
+		return this.resources;
+	}
+	public void setParameters(Set<MsoHeatEnvironmentParameter> paramSet) {
+		if (paramSet == null) {
+			this.parameters = null;
+		} else {
+			this.parameters = paramSet;
+		}
+	}
+	public void setResources(Set<MsoHeatEnvironmentResource> resourceSet) {
+		if (resourceSet == null) {
+			this.resources = null;
+		} else {
+			this.resources = resourceSet;
+		}
+	}
+	
+	public void addParameter(MsoHeatEnvironmentParameter hep) {
+		if (this.parameters == null) {
+			this.parameters = new HashSet<>();
+		}
+		this.parameters.add(hep);
+	}
+	public void addResource(MsoHeatEnvironmentResource her) {
+		if (this.resources == null) {
+			this.resources = new HashSet<>();
+		}
+		this.resources.add(her);
+	}
+	
+	public int getNumberOfParameters() {
+		return this.parameters.size();
+	}
+	public int getNumberOfResources() {
+		return this.resources.size();
+	}
+	
+	public boolean hasResources() {
+		if (this.resources != null && this.resources.size() > 0) {
+			return true;
+		} 
+		return false;
+	}
+	public boolean hasParameters() {
+		if (this.parameters != null && this.parameters.size() > 0) {
+			return true;
+		}
+		return false;
+	}
+	
 	public boolean containsParameter(String paramName) {
+		boolean contains = false;
 		if (this.parameters == null || this.parameters.size() < 1) {
 			return false;
 		}
 		if (this.parameters.contains(new MsoHeatEnvironmentParameter(paramName))) {
+			contains = true;
+		}
+		return contains;
+	}
+	
+	public boolean containsParameter(String paramName, String paramAlias) {
+		if (this.containsParameter(paramName)) {
+			return true;
+		}
+		if (this.containsParameter(paramAlias)) {
 			return true;
 		}
 		return false;
 	}
-
+	
 	@Override
 	public String toString() {
 		return "MsoHeatEnvironmentEntry{" + "parameters=" + parameters +
 			", resourceRegistryEntryRaw='" + resourceRegistryEntryRaw + '\'' +
 			'}';
 	}
-
-	public String getRawEntry() {
-		return rawEntry;
+	
+	public StringBuilder toFullStringExcludeNonParams(Set<HeatTemplateParam> params) {
+		// Basically give back the envt - but exclude the params that aren't in the HeatTemplate 
+		
+		StringBuilder sb = new StringBuilder();
+		ArrayList<String> paramNameList = new ArrayList<String>(params.size());
+		for (HeatTemplateParam htp : params) {
+			paramNameList.add(htp.getParamName());
+		}
+		
+		if (this.hasParameters()) {
+			sb.append("parameters:\n");
+			for (MsoHeatEnvironmentParameter hep : this.parameters) {
+				String paramName = hep.getName();
+				if (paramNameList.contains(paramName)) {
+					// This parameter *is* in the Heat Template - so include it:
+					sb.append("  " + hep.getName() + ": " + hep.getValue() + "\n");
+					// New - 1607 - if any of the params mapped badly - JUST RETURN THE ORIGINAL ENVT!
+					if (hep.getValue().startsWith("_BAD")) {
+						return this.rawEntry;
+					}
+				} 
+			}
+			sb.append("\n");
+		}
+//		if (this.hasResources()) {
+//			sb.append("resource_registry:\n");
+//			for (MsoHeatEnvironmentResource her : this.resources) {
+//				sb.append("   \"" + her.getName() + "\": " + her.getValue() + "\n");
+//			}
+//		}
+		sb.append("\n");
+		sb.append(this.resourceRegistryEntryRaw);				
+		return sb;
 	}
 	
-	private static String getResourceRegistryRawEntry(String rawEntry) {
-		int indexOf = rawEntry.indexOf("resource_registry:");
-		if (indexOf < 0) {
-			return "";
+	public StringBuilder toFullString() {
+		StringBuilder sb = new StringBuilder();
+		
+		if (this.hasParameters()) {
+			sb.append("parameters:\n");
+			for (MsoHeatEnvironmentParameter hep : this.parameters) {
+				sb.append("   " + hep.getName() + ":  " + hep.getValue() + "\n");
+			}
+			sb.append("\n");
 		}
-		return rawEntry.substring(indexOf);
+//		if (this.hasResources()) {
+//			sb.append("resource_registry:\n");
+//			for (MsoHeatEnvironmentResource her : this.resources) {
+//				sb.append("   \"" + her.getName() + "\": " + her.getValue() + "\n");
+//			}
+//		}
+		sb.append("\n");
+		sb.append(this.resourceRegistryEntryRaw);			
+		return sb;
 	}
-
-	public static MsoHeatEnvironmentEntry create(String rawEntry) {
-		if (rawEntry == null || rawEntry.isEmpty()) {
-			return new MsoHeatEnvironmentEntry(rawEntry);
+	
+        public StringBuilder getRawEntry() {
+                return this.rawEntry;
+        }
+	
+	private StringBuilder getResourceRegistryRawEntry() {
+		
+		if (this.rawEntry == null) {
+			return null;
 		}
-		try {
-			Set<MsoHeatEnvironmentParameter> parameters = new MsoYamlEditorWithEnvt(rawEntry.getBytes())
-					.getParameterListFromEnvt();
-			return new MsoHeatEnvironmentEntry(parameters, rawEntry, true, null,
-					getResourceRegistryRawEntry(rawEntry));
-		} catch (Exception e) {
-			LOGGER.debug(String.format("An exception occurred during processing the following raw entry: %s", rawEntry),
-					e);
-			return new MsoHeatEnvironmentEntry(null, rawEntry, false, e.getMessage(), null);
+		
+		StringBuilder sb = new StringBuilder();
+		int indexOf = this.rawEntry.indexOf("resource_registry:");
+		if (indexOf < 0) { // no resource_registry:
+			return null;
 		}
+		sb.append(this.rawEntry.substring(indexOf));
+		return sb;
 	}
-
+	
 }