2 files changed, 4 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 bf6374bc2f..b634b0c3a5 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) {
@@ -401,7 +401,7 @@ public class MsoHeatUtils extends MsoCommonUtils implements VduPlugin {
                 .filter(p -> "OS::Nova::KeyPair".equalsIgnoreCase(p.getType())).collect(Collectors.toList());
         keyPairs.stream().forEach(keyPair -> {
             try {
-                novaClient.deleteKeyPair(cloudSiteId, tenantId, keyPair.getPhysicalResourceId());
+                novaClient.deleteKeyPair(cloudSiteId, tenantId, keyPair.getLogicalResourceId());
             } catch (MsoCloudSiteNotFound | NovaClientException e) {
                 logger.warn("Could not delete keypair", e);
             }
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..28ad069f8b 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);
     }
@@ -300,7 +300,7 @@ public class MsoHeatUtilsTest extends MsoHeatUtils {
         List<Resource> resources = new ArrayList<>();
         Resource resource = new Resource();
         resource.setName("KeypairName");
-        resource.setPhysicalResourceId("KeypairName");
+        resource.setLogicalResourceId("KeypairName");
         resource.setType("OS::Nova::KeyPair");
         resources.add(resource);