Merge "- Include stack Status Reason when rollback is"

2 files changed, 7 insertions, 4 deletions

diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java
index 16639d9166..92b8cec83b 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java
@@ -291,8 +291,10 @@ public class MsoHeatUtils extends MsoCommonUtils implements VduPlugin {
                 if (!backout) {
                     logger.info("Status is not CREATE_COMPLETE, stack deletion suppressed");
                     stackCreationFailed = true;
-                    throw new StackCreationException("Stack rollback suppressed, stack not deleted",
-                            stackCreationFailed, stackRollbackFailed);
+                    String errorMessage =
+                            "Stack Creation Failed Openstack Status: " + stack.getStackStatus() + " Status Reason: "
+                                    + stack.getStackStatusReason() + ". Stack rollback suppressed, stack not deleted";
+                    throw new StackCreationException(errorMessage, stackCreationFailed, stackRollbackFailed);
                 } else {
                     logger.info("Status is not CREATE_COMPLETE, stack deletion will be executed");
                     stackCreationFailed = true;
diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java
index 92cf96ed16..0f9f7a273e 100644
--- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java
@@ -153,12 +153,13 @@ public class MsoHeatUtilsTest extends MsoHeatUtils {
         stack.setId("id");
         stack.setStackName("stackName");
         stack.setStackStatus("CREATE_IN_PROGRESS");
-        stack.setStackStatusReason("Stack Finished");
+        stack.setStackStatusReason("Stack In Progress");
         CreateStackParam createStackParam = new CreateStackParam();
         createStackParam.setStackName("stackName");
 
         exceptionRule.expect(StackCreationException.class);
-        exceptionRule.expectMessage("Stack rollback suppressed, stack not deleted");
+        exceptionRule.expectMessage(
+                "Stack Creation Failed Openstack Status: CREATE_IN_PROGRESS Status Reason: Stack In Progress. Stack rollback suppressed, stack not deleted");
         heatUtils.postProcessStackCreate(stack, false, 120, false, cloudSiteId, tenantId, createStackParam);
     }