From 7484d69ad7fb0bb17a3fffdaa06b6dffb4f816cd Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Fri, 12 Apr 2019 20:48:37 -0400 Subject: [PATCH] PNFs are not picked from SNIRO response vnfHostName with empty value is present. PNFName should be use a key to pnf AAI object (not pnfId). FIxed bug recently introduced in ConfigurationResourceCustomizationRepository. Change-Id: I968ad84d282d9c16ead16d1559a5e790057e6e1e Issue-ID: SO-1785 Signed-off-by: Benjamin, Max (mb388a) --- .../src/main/java/org/onap/so/bpmn/buildingblock/SniroHomingV2.java | 2 +- .../data/repository/ConfigurationResourceCustomizationRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/buildingblock/SniroHomingV2.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/buildingblock/SniroHomingV2.java index 29037980cc..2f898b6697 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/buildingblock/SniroHomingV2.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/buildingblock/SniroHomingV2.java @@ -531,7 +531,7 @@ public class SniroHomingV2 { si.setServiceInstanceId(identifierValue); si.setOrchestrationStatus(OrchestrationStatus.CREATED); cloud.setLcpCloudRegionId(assignmentsMap.get("cloudRegionId")); - if (assignmentsMap.containsKey("vnfHostName")) { + if (assignmentsMap.containsKey("vnfHostName") && !assignmentsMap.get("vnfHostName").isEmpty()) { logger.debug("Resources has been homed to a vnf"); GenericVnf vnf = setVnf(assignmentsMap); vnf.setCloudRegion(cloud); diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ConfigurationResourceCustomizationRepository.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ConfigurationResourceCustomizationRepository.java index 43104986ff..74c4c8cb04 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ConfigurationResourceCustomizationRepository.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ConfigurationResourceCustomizationRepository.java @@ -26,6 +26,6 @@ import org.springframework.data.rest.core.annotation.RepositoryRestResource; @RepositoryRestResource(collectionResourceRel = "configurationResourceCustomization", path = "configurationResourceCustomization") public interface ConfigurationResourceCustomizationRepository - extends JpaRepository { + extends JpaRepository { } -- 2.16.6