From e7bbcbba4e6106c1eef3f7a252cc4ed9b3067fd7 Mon Sep 17 00:00:00 2001 From: "raviteja.karumuri" Date: Wed, 27 Jul 2022 19:23:48 +0100 Subject: [SO] SO BPMN Infra changes for sending resourceId to CNFM. Issue-ID: SO-3979 Signed-off-by: raviteja.karumuri Change-Id: I7931fa8025af09def6bb3356072fb79bc03dbf63 --- .../so/bpmn/infrastructure/adapter/cnfm/tasks/CnfInstantiateTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfInstantiateTask.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfInstantiateTask.java index 0fba2d382b..0071e36ef9 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfInstantiateTask.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnfm/tasks/CnfInstantiateTask.java @@ -22,6 +22,7 @@ package org.onap.so.bpmn.infrastructure.adapter.cnfm.tasks; import static java.util.Objects.isNull; import static org.onap.so.cnfm.lcm.model.utils.AdditionalParamsConstants.CLOUD_OWNER_PARAM_KEY; import static org.onap.so.cnfm.lcm.model.utils.AdditionalParamsConstants.CLOUD_REGION_PARAM_KEY; +import static org.onap.so.cnfm.lcm.model.utils.AdditionalParamsConstants.RESOURCE_ID_KEY; import static org.onap.so.cnfm.lcm.model.utils.AdditionalParamsConstants.SERVICE_INSTANCE_ID_PARAM_KEY; import static org.onap.so.cnfm.lcm.model.utils.AdditionalParamsConstants.SERVICE_INSTANCE_NAME_PARAM_KEY; import static org.onap.so.cnfm.lcm.model.utils.AdditionalParamsConstants.TENANT_ID_PARAM_KEY; @@ -99,6 +100,7 @@ public class CnfInstantiateTask { final ModelInfo modelInfo = requestDetails.getModelInfo(); final CloudConfiguration cloudConfiguration = requestDetails.getCloudConfiguration(); final ServiceInstance serviceInstance = generalBuildingBlock.getServiceInstance(); + final String resourceId = executeBuildingBlock.getResourceId(); final CreateAsRequest createAsRequest = new CreateAsRequest().asdId(modelInfo.getModelVersionId()) .asInstanceName(requestDetails.getRequestInfo().getInstanceName()) @@ -106,7 +108,7 @@ public class CnfInstantiateTask { CLOUD_REGION_PARAM_KEY, cloudConfiguration.getLcpCloudRegionId(), TENANT_ID_PARAM_KEY, cloudConfiguration.getTenantId(), SERVICE_INSTANCE_ID_PARAM_KEY, serviceInstance.getServiceInstanceId(), SERVICE_INSTANCE_NAME_PARAM_KEY, - serviceInstance.getServiceInstanceName())); + serviceInstance.getServiceInstanceName(), RESOURCE_ID_KEY, resourceId)); LOGGER.debug("Adding CreateAsRequest to execution {}", createAsRequest); -- cgit 1.2.3-korg