summaryrefslogtreecommitdiffstats
path: root/adapters
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2019-06-07 17:39:03 +0000
committerGerrit Code Review <gerrit@onap.org>2019-06-07 17:39:03 +0000
commit986dd3431bc196a2234dc45436102d692031ea4f (patch)
treeb1eee2adde1cfd3a1a3237156471018857a89757 /adapters
parent945d4522d6433c2a458975dcad867ee8c27ca2d9 (diff)
parent212d180dabf202ef256218b76b9614b2433d8f58 (diff)
Merge "Updated to use the logicalResourceId"
Diffstat (limited to 'adapters')
-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 7778e53ee3..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
@@ -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 9f577d8679..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
@@ -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);