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.NAMESPACE_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;
import java.net.URI;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.NoSuchElementException;
import java.util.Optional;
-import org.apache.groovy.util.Maps;
import org.onap.logging.filter.base.ONAPComponents;
import org.onap.so.bpmn.common.BuildingBlockExecution;
import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
import org.onap.so.bpmn.servicedecomposition.entities.ExecuteBuildingBlock;
import org.onap.so.bpmn.servicedecomposition.entities.GeneralBuildingBlock;
import org.onap.so.client.exception.ExceptionBuilder;
+import org.onap.so.cnfm.lcm.model.AsInfoModificationRequestDeploymentItems;
import org.onap.so.cnfm.lcm.model.AsInstance;
import org.onap.so.cnfm.lcm.model.CreateAsRequest;
import org.onap.so.cnfm.lcm.model.InstantiateAsRequest;
-import org.onap.so.cnfm.lcm.model.AsInfoModificationRequestDeploymentItems;
import org.onap.so.serviceinstancebeans.CloudConfiguration;
import org.onap.so.serviceinstancebeans.ModelInfo;
import org.onap.so.serviceinstancebeans.RequestDetails;
*/
@Component
public class CnfInstantiateTask {
+ private static final String DEPLOYMENT_ITEMS_KEY = "deploymentItems";
private static final String CREATE_AS_REQUEST_OBJECT = "CreateAsRequestObject";
private static final String INSTANTIATE_AS_REQUEST_OBJECT = "InstantiateAsRequest";
private static final String CNFM_REQUEST_STATUS_CHECK_URL = "CnfmStatusCheckUrl";
+ private static final String MONITOR_JOB_NAME = "MonitorJobName";
private static final String AS_INSTANCE_ID = "asInstanceid";
private static final Logger LOGGER = LoggerFactory.getLogger(CnfInstantiateTask.class);
private final ExceptionBuilder exceptionUtil;
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())
- .additionalParams(Maps.of(CLOUD_OWNER_PARAM_KEY, cloudConfiguration.getCloudOwner(),
- 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()));
+ .putAdditionalParamsItem(CLOUD_OWNER_PARAM_KEY, cloudConfiguration.getCloudOwner())
+ .putAdditionalParamsItem(CLOUD_REGION_PARAM_KEY, cloudConfiguration.getLcpCloudRegionId())
+ .putAdditionalParamsItem(TENANT_ID_PARAM_KEY, cloudConfiguration.getTenantId())
+ .putAdditionalParamsItem(SERVICE_INSTANCE_ID_PARAM_KEY, serviceInstance.getServiceInstanceId())
+ .putAdditionalParamsItem(SERVICE_INSTANCE_NAME_PARAM_KEY, serviceInstance.getServiceInstanceName())
+ .putAdditionalParamsItem(RESOURCE_ID_KEY, resourceId);
+
+ final List<Map<String, Object>> userParams = requestDetails.getRequestParameters().getUserParams();
+ if (userParams != null) {
+ userParams.stream().filter(entry -> entry.containsKey(NAMESPACE_KEY)).findAny()
+ .ifPresent(userParam -> createAsRequest.putAdditionalParamsItem(NAMESPACE_KEY,
+ userParam.get(NAMESPACE_KEY)));
+ }
LOGGER.debug("Adding CreateAsRequest to execution {}", createAsRequest);
"Unable to invoke CNFM for CreateAsRequest", ONAPComponents.SO);
}
- final AsInstance asInstance = optional.orElseThrow();
+ final AsInstance asInstance =
+ optional.orElseThrow(() -> new NoSuchElementException("AsInstance object is empty"));
execution.setVariable(AS_INSTANCE_ID, asInstance.getAsInstanceid());
LOGGER.debug("Successfully invoked CNFM response: {}", asInstance);
(ExecuteBuildingBlock) execution.getVariable("buildingBlock");
final RequestDetails requestDetails = executeBuildingBlock.getRequestDetails();
final InstantiateAsRequest instantiateAsRequest = new InstantiateAsRequest();
+
if (requestDetails != null && requestDetails.getRequestParameters() != null) {
- List<Map<String, Object>> userParams = requestDetails.getRequestParameters().getUserParams();
+ final List<Map<String, Object>> userParams = requestDetails.getRequestParameters().getUserParams();
if (userParams != null && !userParams.isEmpty()) {
- List deploymentItems = new ArrayList<Object>();
- List deploymentItemsReq = new ArrayList<AsInfoModificationRequestDeploymentItems>();
- for (Map<String, Object> userParam : userParams) {
- if (userParam.containsKey("deploymentItems")) {
- deploymentItems = (ArrayList<Object>) userParam.get("deploymentItems");
- break;
- }
- }
- for (Object deploymentItem : deploymentItems) {
- Map<String, Object> deploymentItemMap = (Map<String, Object>) deploymentItem;
- AsInfoModificationRequestDeploymentItems item = new AsInfoModificationRequestDeploymentItems();
+ final List<Object> deploymentItems = getDeploymentItems(userParams);
+ final List<AsInfoModificationRequestDeploymentItems> deploymentItemsReq = new ArrayList<>();
+ for (final Object deploymentItem : deploymentItems) {
+ final Map<String, Object> deploymentItemMap = (Map<String, Object>) deploymentItem;
+ final AsInfoModificationRequestDeploymentItems item =
+ new AsInfoModificationRequestDeploymentItems();
item.setDeploymentItemsId(deploymentItemMap.get("deploymentItemsId").toString());
item.setLifecycleParameterKeyValues(deploymentItemMap.get("lifecycleParameterKeyValues"));
deploymentItemsReq.add(item);
try {
final InstantiateAsRequest instantiateAsRequest = execution.getVariable(INSTANTIATE_AS_REQUEST_OBJECT);
final String asInstanceId = execution.getVariable(AS_INSTANCE_ID);
- Optional<URI> cnf_status_check_url =
+ final Optional<URI> cnfStatusCheckURL =
cnfmHttpServiceProvider.invokeInstantiateAsRequest(instantiateAsRequest, asInstanceId);
- execution.setVariable(CNFM_REQUEST_STATUS_CHECK_URL, cnf_status_check_url.get());
+ execution.setVariable(CNFM_REQUEST_STATUS_CHECK_URL, cnfStatusCheckURL.orElseThrow());
+ execution.setVariable(MONITOR_JOB_NAME, "Instantiate");
LOGGER.debug("Successfully invoked CNFM instantiate AS request: {}", asInstanceId);
} catch (final Exception exception) {
LOGGER.error("Unable to invoke CNFM InstantiateAsRequest", exception);
}
}
+ private List<Object> getDeploymentItems(final List<Map<String, Object>> userParams) {
+ for (final Map<String, Object> userParam : userParams) {
+ if (userParam.containsKey(DEPLOYMENT_ITEMS_KEY)) {
+ return (ArrayList<Object>) userParam.get(DEPLOYMENT_ITEMS_KEY);
+ }
+ }
+ return Collections.emptyList();
+ }
}
Code Review / so.git / blobdiff