summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPlummer, Brittany <brittany.plummer@att.com>2019-06-06 15:51:46 -0400
committerBenjamin, Max (mb388a) <mb388a@us.att.com>2019-06-06 15:51:57 -0400
commit212d180dabf202ef256218b76b9614b2433d8f58 (patch)
treecf69d4fb92f2f8da4be46e37d727367d9310cbea
parentc4b90365d5c117bc6fd64af421a1468539a8aec3 (diff)
Updated to use the logicalResourceId
Updated to use the logicalResourceId instead of physicalResourceId Change-Id: I2ebc800cf7ce4b5794bece7c304ebd7d1ac92088 Issue-ID: SO-1979 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
-rw-r--r--adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java2
-rw-r--r--adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java2
2 files changed, 2 insertions, 2 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..350f14c3a9 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
@@ -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..c2edd9ca9b 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
@@ -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);