From: Kalkere Ramesh, Sharan <sharan.kalkere.ramesh@att.com>
Date: Thu, 6 Jun 2019 19:48:55 +0000 (-0400)
Subject: change the update line to update the latest stack
X-Git-Tag: 1.5.2~294^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F89540%2F1;p=so.git

change the update line to update the latest stack

fix the unit test for latest stack update
change the update line to update the latest stack

Change-Id: I8b7f903c9f7bbae1163f1363a19f18b2803f558c
Issue-ID: SO-1977
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---

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 bf6374bc2f..7778e53ee3 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
@@ -326,7 +326,7 @@ public class MsoHeatUtils extends MsoCommonUtils implements VduPlugin {
         Stack latestStack = null;
         while (true) {
             latestStack = queryHeatStack(heatClient, stack.getStackName() + "/" + stack.getId());
-            statusHandler.updateStackStatus(stack);
+            statusHandler.updateStackStatus(latestStack);
             logger.debug("Polling: {} ({})", latestStack.getStackStatus(), latestStack.getStackName());
             if (stackStatus.equals(latestStack.getStackStatus())) {
                 if (numberOfPollingAttempts <= 0) {
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 5a2515a81e..9f577d8679 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
@@ -126,7 +126,7 @@ public class MsoHeatUtilsTest extends MsoHeatUtils {
         doReturn(latestStack).when(heatUtils).queryHeatStack(isA(Heat.class), eq("stackName/id"));
         doReturn(heatClient).when(heatUtils).getHeatClient(cloudSiteId, tenantId);
         Stack actual = heatUtils.pollStackForStatus(1, stack, "CREATE_IN_PROGRESS", cloudSiteId, tenantId);
-        Mockito.verify(stackStatusHandler, times(1)).updateStackStatus(stack);
+        Mockito.verify(stackStatusHandler, times(1)).updateStackStatus(latestStack);
         Mockito.verify(heatUtils, times(1)).queryHeatStack(isA(Heat.class), eq("stackName/id"));
         assertEquals(true, actual != null);
     }