4 files changed, 138 insertions, 110 deletions

diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/StackInfo.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/StackInfo.java
index 83e1484257..600985e310 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/StackInfo.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/StackInfo.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,136 +20,89 @@
 
 package org.openecomp.mso.openstack.beans;
 
-
-import java.util.Map;
-import java.util.HashMap;
-
 import com.woorea.openstack.heat.model.Stack;
+import java.util.HashMap;
+import java.util.Map;
 
 /*
  * This Java bean class relays Heat stack status information to ActiveVOS processes.
- * 
+ *
  * This bean is returned by all Heat-specific adapter operations (create, query, delete)
  */
-
 public class StackInfo {
-	// Set defaults for everything
 	private String name = "";
 	private String canonicalName = "";
-	private HeatStatus status = HeatStatus.UNKNOWN;
-	private String statusMessage = "";
-	private Map<String,Object> outputs = new HashMap<String,Object>();
-	private Map<String,Object> parameters = new HashMap<String,Object>();
-	
-	static Map<String,HeatStatus> HeatStatusMap;
-	static {
-		HeatStatusMap = new HashMap<String,HeatStatus>();
-		HeatStatusMap.put("CREATE_IN_PROGRESS", HeatStatus.BUILDING);
-		HeatStatusMap.put("CREATE_COMPLETE", HeatStatus.CREATED);
-		HeatStatusMap.put("CREATE_FAILED", HeatStatus.FAILED);
-		HeatStatusMap.put("DELETE_IN_PROGRESS", HeatStatus.DELETING);
-		HeatStatusMap.put("DELETE_COMPLETE", HeatStatus.NOTFOUND);
-		HeatStatusMap.put("DELETE_FAILED", HeatStatus.FAILED);
-		HeatStatusMap.put("UPDATE_IN_PROGRESS", HeatStatus.UPDATING);
-		HeatStatusMap.put("UPDATE_FAILED", HeatStatus.FAILED);
-		HeatStatusMap.put("UPDATE_COMPLETE", HeatStatus.UPDATED);
-	}
+	private HeatStatus status;
+	private Map<String, Object> outputs = new HashMap<>();
+	private Map<String,Object> parameters = new HashMap<>();
+	static private Map<String, HeatStatus> heatStatusMap;
 
-	public StackInfo () {
+	static {
+		heatStatusMap = new HashMap<>();
+		heatStatusMap.put("CREATE_IN_PROGRESS", HeatStatus.BUILDING);
+		heatStatusMap.put("CREATE_COMPLETE", HeatStatus.CREATED);
+		heatStatusMap.put("CREATE_FAILED", HeatStatus.FAILED);
+		heatStatusMap.put("DELETE_IN_PROGRESS", HeatStatus.DELETING);
+		heatStatusMap.put("DELETE_COMPLETE", HeatStatus.NOTFOUND);
+		heatStatusMap.put("DELETE_FAILED", HeatStatus.FAILED);
+		heatStatusMap.put("UPDATE_IN_PROGRESS", HeatStatus.UPDATING);
+		heatStatusMap.put("UPDATE_FAILED", HeatStatus.FAILED);
+		heatStatusMap.put("UPDATE_COMPLETE", HeatStatus.UPDATED);
 	}
-	
-	public StackInfo (String name, HeatStatus status, String statusMessage, Map<String,Object> outputs) {
-		this.name = name;
-		this.canonicalName = name;	// Don't have an ID, so just use name
 
-		this.status = status;
-		if (statusMessage != null)  this.statusMessage = statusMessage;
-		if (outputs != null)  this.outputs = outputs;
-	}
-	
 	public StackInfo (String name, HeatStatus status) {
 		this.name = name;
 		this.canonicalName = name;	// Don't have an ID, so just use name
 		this.status = status;
 	}
-	
+
 	public StackInfo (Stack stack)
 	{
 		if (stack == null) {
 			this.status = HeatStatus.NOTFOUND;
 			return;
 		}
-	
 		this.name = stack.getStackName();
 		this.canonicalName = stack.getStackName() + "/" + stack.getId();
 
 		if (stack.getStackStatus() == null) {
 			this.status = HeatStatus.INIT;
-		} else if (HeatStatusMap.containsKey(stack.getStackStatus())) {
-			this.status = HeatStatusMap.get(stack.getStackStatus());
+		} else if (heatStatusMap.containsKey(stack.getStackStatus())) {
+			this.status = heatStatusMap.get(stack.getStackStatus());
 		} else {
 			this.status = HeatStatus.UNKNOWN;
 		}
-		
-		this.statusMessage = stack.getStackStatusReason();
-		
 		if (stack.getOutputs() != null) {
-			this.outputs = new HashMap<String,Object>();
-			for (Stack.Output output : stack.getOutputs()) {
-				this.outputs.put(output.getOutputKey(), output.getOutputValue());
-			}
+			this.outputs = new HashMap<>();
+			stack.getOutputs().forEach(output -> outputs.put(output.getOutputKey(), output.getOutputValue()));
 		}
-		
+
 		this.parameters = stack.getParameters();
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName (String name) {
 		this.name = name;
 	}
-	
+
 	public String getCanonicalName() {
 		return canonicalName;
 	}
-	
-	public void setCanonicalName (String name) {
-		this.canonicalName = name;
-	}
-	
+
 	public HeatStatus getStatus() {
 		return status;
 	}
-	
-	public void setStatus (HeatStatus status) {
-		this.status = status;
-	}
-	
-	public String getStatusMessage() {
-		return statusMessage;
-	}
-	
-	public void setStatusMessage (String statusMessage) {
-		this.statusMessage = statusMessage;
-	}
-	
-	public Map<String,Object> getOutputs () {
+
+	public Map<String, Object> getOutputs() {
 		return outputs;
 	}
-	
-	public void setOutputs (Map<String,Object> outputs) {
-		this.outputs = outputs;
-	}
-	
+
 	public Map<String,Object> getParameters () {
 		return parameters;
 	}
-	
-	public void setParameters (Map<String,Object> parameters) {
-		this.parameters = parameters;
-	}
-	
+
 }
 
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
index 08ea84d85d..8f21cfb2a3 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
@@ -648,7 +648,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
         } catch (MsoTenantNotFound e) {
             // Tenant doesn't exist, so stack doesn't either
             LOGGER.debug ("Tenant with id " + tenantId + "not found.", e);
-            return new StackInfo (stackName, HeatStatus.NOTFOUND, null, null);
+            return new StackInfo (stackName, HeatStatus.NOTFOUND);
         } catch (MsoException me) {
             // Got an Openstack error. Propagate it
             LOGGER.error (MessageEnum.RA_CONNECTION_EXCEPTION, "OpenStack", "Openstack Exception on Token request: " + me, "Openstack", "", MsoLogger.ErrorCode.AvailabilityError, "Connection Exception");
@@ -662,7 +662,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
 
         if (heatStack == null) {
             // Stack does not exist. Return a StackInfo with status NOTFOUND
-            StackInfo stackInfo = new StackInfo (stackName, HeatStatus.NOTFOUND, null, null);
+            StackInfo stackInfo = new StackInfo (stackName, HeatStatus.NOTFOUND);
             return stackInfo;
         }
 
@@ -712,7 +712,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
         } catch (MsoTenantNotFound e) {
             // Tenant doesn't exist, so stack doesn't either
             LOGGER.debug ("Tenant with id " + tenantId + "not found.", e);
-            return new StackInfo (stackName, HeatStatus.NOTFOUND, null, null);
+            return new StackInfo (stackName, HeatStatus.NOTFOUND);
         } catch (MsoException me) {
             // Got an Openstack error. Propagate it
             LOGGER.error (MessageEnum.RA_CONNECTION_EXCEPTION, "Openstack", "Openstack Exception on Token request: " + me, "Openstack", "", MsoLogger.ErrorCode.AvailabilityError, "Connection Exception");
@@ -724,7 +724,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
         Stack heatStack = queryHeatStack (heatClient, stackName);
         if (heatStack == null || "DELETE_COMPLETE".equals (heatStack.getStackStatus ())) {
             // Not found. Return a StackInfo with status NOTFOUND
-            return new StackInfo (stackName, HeatStatus.NOTFOUND, null, null);
+            return new StackInfo (stackName, HeatStatus.NOTFOUND);
         }
 
         // Delete the stack.
@@ -747,7 +747,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
         } catch (OpenStackResponseException e) {
             if (e.getStatus () == 404) {
                 // Not found. We are OK with this. Return a StackInfo with status NOTFOUND
-                return new StackInfo (stackName, HeatStatus.NOTFOUND, null, null);
+                return new StackInfo (stackName, HeatStatus.NOTFOUND);
             } else {
                 // Convert the OpenStackResponseException to an MsoOpenstackException
                 throw heatExceptionToMsoException (e, DELETE_STACK);
@@ -813,7 +813,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
             }
 
             // The stack is gone when this point is reached
-            return new StackInfo (stackName, HeatStatus.NOTFOUND, null, null);
+            return new StackInfo (stackName, HeatStatus.NOTFOUND);
         }
 
         // Return the current status (if not polling, the delete may still be in progress)
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/AdapterBeansTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/AdapterBeansTest.java
index 6bd78153b6..250211845f 100644
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/AdapterBeansTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/AdapterBeansTest.java
@@ -22,18 +22,15 @@ package org.openecomp.mso.adapter_utils.tests;
 

 import static org.junit.Assert.assertTrue;

 

-import com.woorea.openstack.heat.model.Stack;

 import java.util.ArrayList;

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 import org.junit.Test;

 import org.openecomp.mso.entity.MsoRequest;

-import org.openecomp.mso.openstack.beans.HeatStatus;

 import org.openecomp.mso.openstack.beans.MsoTenant;

 import org.openecomp.mso.openstack.beans.NetworkRollback;

 import org.openecomp.mso.openstack.beans.Pool;

-import org.openecomp.mso.openstack.beans.StackInfo;

 import org.openecomp.mso.openstack.beans.Subnet;

 import org.openecomp.mso.openstack.beans.VnfRollback;

 

@@ -99,26 +96,6 @@ public class AdapterBeansTest {
 	}

 

 	@Test

-	public final void stackInfoTest() {

-		StackInfo stackInfo = new StackInfo();

-		new StackInfo(new Stack());

-		new StackInfo("name", HeatStatus.CREATED, "statusmessage", new HashMap<>());

-		new StackInfo("name", HeatStatus.CREATED);

-		stackInfo.setCanonicalName("Canonicalname");

-		stackInfo.getCanonicalName();

-		stackInfo.setName("name");

-		stackInfo.getName();

-		stackInfo.setOutputs(new HashMap<>());

-		stackInfo.getOutputs();

-		stackInfo.setParameters(new HashMap<>());

-		stackInfo.getParameters();

-		stackInfo.setStatus(HeatStatus.CREATED);

-		stackInfo.getStatus();

-		stackInfo.setStatusMessage("statusMessage");

-		stackInfo.getStatusMessage();

-	}

-

-	@Test

 	public final void subnetTest() {

 		Subnet subnet = new Subnet();

 		subnet.setAllocationPools(new ArrayList<>());

diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/beans/StackInfoTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/beans/StackInfoTest.java
new file mode 100644
index 0000000000..9c7911ef89
--- /dev/null
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/beans/StackInfoTest.java
@@ -0,0 +1,98 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * 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.mso.openstack.beans;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.woorea.openstack.heat.model.Stack;
+import java.io.IOException;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.junit.Test;
+
+public class StackInfoTest {
+
+    private static final String STACK_NAME = "stackNameTest";
+    private static final String STACK_STATUS = "CREATE_COMPLETE";
+    private static final String STACK_OUTPUT_KEY = "outputKeyTest";
+    private static final String STACK_OUTPUT_VALUE = "outputValueTest";
+    private static final String STACK_PARAM_KEY = "paramKeyTest";
+    private static final String STACK_PARAM_VALUE = "paramValueTest";
+
+    @Test
+    public void setStatusNotFoundWhenStackIsNull() {
+        StackInfo stackInfo = new StackInfo(null);
+        assertThat(stackInfo.getStatus()).isEqualTo(HeatStatus.NOTFOUND);
+        assertThat(stackInfo.getOutputs()).isEmpty();
+        assertThat(stackInfo.getParameters()).isEmpty();
+    }
+
+    @Test
+    public void createObjectWhenStackStatusIsNull() {
+        StackInfo stackInfo = new StackInfo(createStackWithStatus(null));
+        assertThat(stackInfo.getName()).isEqualTo(STACK_NAME);
+        assertThat(stackInfo.getOutputs()).isEmpty();
+        assertThat(stackInfo.getStatus()).isEqualTo(HeatStatus.INIT);
+        assertThat(stackInfo.getParameters()).hasSize(1).containsEntry(STACK_PARAM_KEY, STACK_PARAM_VALUE);
+    }
+
+    @Test
+    public void createObjectWhenStackStatusIsFound() {
+        StackInfo stackInfo = new StackInfo(createStackWithStatus(STACK_STATUS));
+        assertThat(stackInfo.getName()).isEqualTo(STACK_NAME);
+        assertThat(stackInfo.getOutputs()).isEmpty();
+        assertThat(stackInfo.getStatus()).isEqualTo(HeatStatus.CREATED);
+        assertThat(stackInfo.getParameters()).hasSize(1).containsEntry(STACK_PARAM_KEY, STACK_PARAM_VALUE);
+    }
+
+    @Test
+    public void createObjectWhenStackStatusIsUnknown() {
+        StackInfo stackInfo = new StackInfo(createStackWithStatus("unknownStatus"));
+        assertThat(stackInfo.getName()).isEqualTo(STACK_NAME);
+        assertThat(stackInfo.getOutputs()).isEmpty();
+        assertThat(stackInfo.getStatus()).isEqualTo(HeatStatus.UNKNOWN);
+        assertThat(stackInfo.getParameters()).hasSize(1).containsEntry(STACK_PARAM_KEY, STACK_PARAM_VALUE);
+    }
+
+    @Test
+    public void createStackWhenOutputsListIsNotNull() throws IOException {
+        StackInfo stackInfo = new StackInfo(createStackWithOutputs());
+        assertThat(stackInfo.getOutputs()).isNotEmpty().hasSize(1);
+        assertThat(stackInfo.getOutputs()).hasSize(1).containsEntry(STACK_OUTPUT_KEY, STACK_OUTPUT_VALUE);
+    }
+
+    private Stack createStackWithStatus(String stackStatus) {
+        Stack stack = new Stack();
+        stack.setStackName(STACK_NAME);
+        stack.setStackStatus(stackStatus);
+        stack.getParameters().put(STACK_PARAM_KEY, STACK_PARAM_VALUE);
+        return stack;
+    }
+
+    private Stack createStackWithOutputs() throws IOException {
+        String json = "{\"outputs\":[{\"output_key\" : \"" + STACK_OUTPUT_KEY + "\", \"output_value\" : \""
+                + STACK_OUTPUT_VALUE + "\" }]}";
+        JsonNode node = new ObjectMapper().readTree(json);
+        Stack stack = new ObjectMapper().readValue(node, Stack.class);
+        return stack;
+    }
+
+}